Author: hibou
Date: Thu Jul 24 07:39:49 2008
New Revision: 679426
URL: http://svn.apache.org/viewvc?rev=679426&view=rev
Log:
IVYDE-105
- Fix the spell mistake intorduced
- fixed the existing ones while keeping backward compatibility
- remove java 1.5 Boolean to boolean auto-boxing
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEPreferenceStoreHelper.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceConstants.java
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java?rev=679426&r1=679425&r2=679426&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java
Thu Jul 24 07:39:49 2008
@@ -111,8 +111,11 @@
|| event.getProperty() ==
PreferenceConstants.JAVADOC_TYPES
|| event.getProperty() ==
PreferenceConstants.SOURCES_SUFFIXES
|| event.getProperty() ==
PreferenceConstants.JAVADOC_SUFFIXES
+ || event.getProperty() ==
PreferenceConstants.DO_RETRIEVE_DEPRECATED
+ || event.getProperty() ==
PreferenceConstants.RETRIEVE_PATTERN_DEPRECATED
|| event.getProperty() ==
PreferenceConstants.DO_RETRIEVE
|| event.getProperty() ==
PreferenceConstants.RETRIEVE_PATTERN
+ || event.getProperty() ==
PreferenceConstants.RETRIEVE_SYNC
|| event.getProperty() ==
PreferenceConstants.ALPHABETICAL_ORDER) {
prefStoreChanged();
}
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java?rev=679426&r1=679425&r2=679426&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java
Thu Jul 24 07:39:49 2008
@@ -177,7 +177,7 @@
retrievePattern = value;
isProjectSpecific = true;
} else if (parameter[0].equals("retrieveSync")) {
- retrieveSync = Boolean.valueOf(value);
+ retrieveSync = Boolean.valueOf(value).booleanValue();
isProjectSpecific = true;
} else if (parameter[0].equals("alphaOrder")) {
// if the value is not actually "true" or "false", the Boolean
class ensure to
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEPreferenceStoreHelper.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEPreferenceStoreHelper.java?rev=679426&r1=679425&r2=679426&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEPreferenceStoreHelper.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEPreferenceStoreHelper.java
Thu Jul 24 07:39:49 2008
@@ -40,8 +40,26 @@
prefStore.setDefault(PreferenceConstants.JAVADOC_TYPES, "javadoc");
prefStore.setDefault(PreferenceConstants.SOURCES_SUFFIXES,
"-source,-sources,-src");
prefStore.setDefault(PreferenceConstants.JAVADOC_SUFFIXES,
"-javadoc,-javadocs,-doc,-docs");
+
prefStore.setDefault(PreferenceConstants.DO_RETRIEVE, false);
+ boolean b =
prefStore.getBoolean(PreferenceConstants.DO_RETRIEVE_DEPRECATED);
+ if (b) {
+ // not the default value, so it has been set
+ // erase the deprecated preference and store the new one
+ prefStore.setValue(PreferenceConstants.DO_RETRIEVE_DEPRECATED,
null);
+ prefStore.setValue(PreferenceConstants.DO_RETRIEVE, true);
+ }
+
prefStore.setDefault(PreferenceConstants.RETRIEVE_PATTERN,
"lib/[conf]/[artifact].[ext]");
+ String s =
prefStore.getString(PreferenceConstants.RETRIEVE_PATTERN_DEPRECATED);
+ if (s != null && s.length() != 0) {
+ // not the default value, so it has been set
+ // erase the deprecated preference and store the new one
+
prefStore.setValue(PreferenceConstants.RETRIEVE_PATTERN_DEPRECATED, null);
+ prefStore.setValue(PreferenceConstants.RETRIEVE_PATTERN, s);
+ }
+
+ prefStore.setDefault(PreferenceConstants.RETRIEVE_SYNC, false);
prefStore.setDefault(PreferenceConstants.ALPHABETICAL_ORDER, false);
}
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceConstants.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceConstants.java?rev=679426&r1=679425&r2=679426&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceConstants.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceConstants.java
Thu Jul 24 07:39:49 2008
@@ -44,11 +44,15 @@
public static final String P_STRING = "stringPreference";
- public static final String DO_RETRIEVE = "do.retreive";
+ public static final String DO_RETRIEVE_DEPRECATED = "do.retreive";
- public static final String RETRIEVE_PATTERN = "retreive.pattern";
+ public static final String RETRIEVE_PATTERN_DEPRECATED =
"retreive.pattern";
- public static final String RETRIEVE_SYNC = "retreive.sync";
+ public static final String DO_RETRIEVE = "do.retrieve";
+
+ public static final String RETRIEVE_PATTERN = "retrieve.pattern";
+
+ public static final String RETRIEVE_SYNC = "retrieve.sync";
public static final String ALPHABETICAL_ORDER = "order.alphabetical";
