ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1538208 - in /ant/ivy/ivyde/trunk: doc/release-notes.html org.apache.ivyde.eclipse/.project org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/preferences/PreferenceInitializer.java
Date Sat, 02 Nov 2013 16:00:21 GMT
Author: hibou
Date: Sat Nov  2 16:00:21 2013
New Revision: 1538208

URL: http://svn.apache.org/r1538208
Log:
IVYDE-351: fix SWTException in PreferenceInitializer (thanks to Carsten Pfeiffer)

Modified:
    ant/ivy/ivyde/trunk/doc/release-notes.html
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/.project
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/preferences/PreferenceInitializer.java

Modified: ant/ivy/ivyde/trunk/doc/release-notes.html
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/doc/release-notes.html?rev=1538208&r1=1538207&r2=1538208&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/doc/release-notes.html (original)
+++ ant/ivy/ivyde/trunk/doc/release-notes.html Sat Nov  2 16:00:21 2013
@@ -158,6 +158,7 @@ List of changes since <a href="/ivy/ivyd
     <li>FIX: IvyDE doesn't update .classpath anymore; sometimes some containers could
not get initialized (IVYDE-299)</li>
 	<li>FIX: Only one resolve is done when several are sharing the same ivy.xml and the
workspace resolver is enabled (IVYDE-293)</li>
 	<li>FIX: Problem when exporting the eclipse-plugins (compiler target 1.2) (IVYDE-293)
(thanks to Carsten Pfeiffer)</li>
+	<li>FIX: SWTException in PreferenceInitializer (IVYDE-351) (thanks to Carsten Pfeiffer)</li>
 </ul>
     <!-- samples
 <ul>

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/.project
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/.project?rev=1538208&r1=1538207&r2=1538208&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/.project (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/.project Sat Nov  2 16:00:21 2013
@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.    
--->
 <projectDescription>
 	<name>org.apache.ivyde.eclipse</name>
 	<comment></comment>
@@ -39,8 +21,13 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
 			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/net.sf.eclipsecs.core.CheckstyleBuilder.launch</value>
+				</dictionary>
 			</arguments>
 		</buildCommand>
 	</buildSpec>

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/preferences/PreferenceInitializer.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/preferences/PreferenceInitializer.java?rev=1538208&r1=1538207&r2=1538208&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/preferences/PreferenceInitializer.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/preferences/PreferenceInitializer.java
Sat Nov  2 16:00:21 2013
@@ -29,8 +29,8 @@ import org.apache.ivyde.internal.eclipse
 import org.apache.ivyde.internal.eclipse.ui.editors.xml.IXMLColorConstants;
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.jface.resource.StringConverter;
+import org.eclipse.swt.graphics.RGB;
 
 /**
  * Class used to initialize default preference values.
@@ -191,16 +191,15 @@ public class PreferenceInitializer exten
         store.setDefault(PreferenceConstants.IGNORE_VERSION_ON_WORKSPACE_PROJECTS,
             DEFAULT_IGNORE_VERSION_ON_WORKSPACE_PROJECTS);
 
-        PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_COLOR_XML_COMMENT,
-            IXMLColorConstants.XML_COMMENT);
-        PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_COLOR_PROC_INSTR,
-            IXMLColorConstants.PROC_INSTR);
-        PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_COLOR_STRING,
-            IXMLColorConstants.STRING);
-        PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_COLOR_DEFAULT,
-            IXMLColorConstants.DEFAULT);
-        PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_COLOR_TAG,
-            IXMLColorConstants.TAG);
+        store.setDefault(PreferenceConstants.EDITOR_COLOR_XML_COMMENT,
+            asString(IXMLColorConstants.XML_COMMENT));
+        store.setDefault(PreferenceConstants.EDITOR_COLOR_PROC_INSTR,
+            asString(IXMLColorConstants.PROC_INSTR));
+        store.setDefault(PreferenceConstants.EDITOR_COLOR_STRING,
+            asString(IXMLColorConstants.STRING));
+        store.setDefault(PreferenceConstants.EDITOR_COLOR_DEFAULT,
+            asString(IXMLColorConstants.DEFAULT));
+        store.setDefault(PreferenceConstants.EDITOR_COLOR_TAG, asString(IXMLColorConstants.TAG));
 
         store.setDefault(PreferenceConstants.RETRIEVED_CLASSPATH, DEFAULT_RETRIEVED_CLASSPATH);
         store.setDefault(PreferenceConstants.RETRIEVED_CLASSPATH_PATTERN,
@@ -214,4 +213,7 @@ public class PreferenceInitializer exten
         store.setDefault(PreferenceConstants.ERROR_POPUP, DEFAULT_ERROR_POPUP);
     }
 
+    private String asString(RGB value) {
+        return StringConverter.asString(value);
+    }
 }



Mime
View raw message