Author: hibou
Date: Tue Jan 18 16:10:25 2011
New Revision: 1060436
URL: http://svn.apache.org/viewvc?rev=1060436&view=rev
Log:
IVYDE-235 : Add configuration option to use an extended revision id when
resolving eclipse projects (thanks to Jeffrey M. Metcalf)
Modified:
ant/ivy/ivyde/trunk/doc/release-notes.html
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.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/cpcontainer/IvyClasspathResolver.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvydeContainerPage.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/ClasspathPreferencePage.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
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/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=1060436&r1=1060435&r2=1060436&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/doc/release-notes.html (original)
+++ ant/ivy/ivyde/trunk/doc/release-notes.html Tue Jan 18 16:10:25 2011
@@ -129,6 +129,7 @@ List of changes since <a href="/ivy/ivyd
<li>NEW: Open the ivy file on the double click in the reverse dependency
explorer</li>
<li>NEW: The ivysettings field editor now supports the variable
${ivyproject_loc} which is referencing the current project being resolved
(IVYDE-247)</li>
<li>NEW: Resolve error popups can now be avoided (IVYDE-268)</li>
+ <li>NEW: Add configuration option to use an extended revision id when
resolving eclipse projects (IVYDE-235) (thanks to Jeffrey M. Metcalf)</li>
</ul><ul>
<li>IMPROVE: let IvyDE refresh workspace after a resolve (IVYDE-27)
(thanks to Clint Burghduff)</li>
<li>IMPROVE: IvyDE now resolve by batch, then preventing too many
workspace build (IVYDE-177)</li>
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java?rev=1060436&r1=1060435&r2=1060436&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
Tue Jan 18 16:10:25 2011
@@ -24,7 +24,6 @@ import java.util.Comparator;
import org.apache.ivy.Ivy;
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
-import org.apache.ivy.core.resolve.ResolveOptions;
import org.apache.ivyde.eclipse.IvyPlugin;
import org.apache.ivyde.eclipse.resolve.IvyResolveJob;
import org.apache.ivyde.eclipse.resolve.ResolveRequest;
@@ -176,7 +175,7 @@ public class IvyClasspathContainer imple
if (md == null) {
return null;
}
- String resolveId = ResolveOptions.getDefaultResolveId(md);
+ String resolveId =
IvyClasspathUtil.buildResolveId(conf.isInheritedUseExtendedResolveId(), md);
try {
return ivy
.getResolutionCacheManager()
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java?rev=1060436&r1=1060435&r2=1060436&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java
Tue Jan 18 16:10:25 2011
@@ -206,6 +206,10 @@ public final class IvyClasspathContainer
standaloneRetrieveSetup.setRetrieveTypes(value);
isRetrieveProjectSpecific = true;
}
+ else if (parameter[0].equals("useExtendedResolveId")) {
+
conf.setUseExtendedResolveId(Boolean.valueOf(value).booleanValue());
+ conf.setAdvancedProjectSpecific(true);
+ }
}
if (conf.isAdvancedProjectSpecific()) {
// in this V1 version, it is just some paranoid check
@@ -368,6 +372,7 @@ public final class IvyClasspathContainer
}
append(path, "mapIfOnlyOneSource",
setup.isMapIfOnlyOneSource());
append(path, "mapIfOnlyOneJavadoc",
setup.isMapIfOnlyOneJavadoc());
+ append(path, "useExtendedResolveId",
conf.isUseExtendedResolveId());
}
} catch (UnsupportedEncodingException e) {
IvyPlugin.log(IStatus.ERROR, UTF8_ERROR, e);
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=1060436&r1=1060435&r2=1060436&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
Tue Jan 18 16:10:25 2011
@@ -55,6 +55,8 @@ public class IvyClasspathContainerConfig
private boolean resolveBeforeLaunch;
+ private boolean useExtendedResolveId;
+
/**
* attributes attached to the container but not IvyDE related (Webtools or
AspectJfor instance)
*/
@@ -174,6 +176,14 @@ public class IvyClasspathContainerConfig
public void setResolveBeforeLaunch(boolean resolveBeforeLaunch) {
this.resolveBeforeLaunch = resolveBeforeLaunch;
}
+
+ public boolean isUseExtendedResolveId() {
+ return useExtendedResolveId;
+ }
+
+ public void setUseExtendedResolveId(boolean useExtendedResolveId) {
+ this.useExtendedResolveId = useExtendedResolveId;
+ }
public IJavaProject getJavaProject() {
return javaProject;
@@ -329,6 +339,13 @@ public class IvyClasspathContainerConfig
return containerMappingSetup.isMapIfOnlyOneJavadoc();
}
+ public boolean isInheritedUseExtendedResolveId() {
+ if (!isAdvancedProjectSpecific) {
+ return
IvyPlugin.getPreferenceStoreHelper().isUseExtendedResolveId();
+ }
+ return useExtendedResolveId;
+ }
+
public String toString() {
return ivyXmlPath + confs
+ (javaProject == null ? "" : " in '" +
javaProject.getProject().getName() + "'");
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathResolver.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathResolver.java?rev=1060436&r1=1060435&r2=1060436&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathResolver.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathResolver.java
Tue Jan 18 16:10:25 2011
@@ -49,6 +49,7 @@ public class IvyClasspathResolver extend
.getJavaProject().getProject());
this.ivycp = ivycp;
this.conf = ivycp.getConf();
+
setUsePreviousResolveIfExist(ivycp.getConf().isInheritedUseExtendedResolveId());
setUsePreviousResolveIfExist(usePreviousResolveIfExist);
if (conf.isInheritedRetrievedClasspath()) {
RetrieveSetup setup = conf.getInheritedRetrievedClasspathSetup();
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java?rev=1060436&r1=1060435&r2=1060436&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java
Tue Jan 18 16:10:25 2011
@@ -28,6 +28,8 @@ import java.util.Iterator;
import java.util.List;
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.apache.ivy.core.resolve.ResolveOptions;
import org.apache.ivyde.eclipse.FakeProjectManager;
import org.apache.ivyde.eclipse.IvyDEException;
import org.apache.ivyde.eclipse.IvyPlugin;
@@ -326,4 +328,34 @@ public final class IvyClasspathUtil {
descriptor.toIvyFile(container.getState().getIvyFile());
}
}
+
+ /**
+ * Build the resolve id used when reading and writing resolve reports.
+ *
+ * @param conf The IvyClasspathContainerConfiguration indicating if
extended resolve id is being used.
+ * @param md The ModuleDescriptor to be resolved.
+ * @return The resolve id.
+ */
+ public static String buildResolveId(boolean useExtendedResolveId,
ModuleDescriptor md) {
+ StringBuffer sb = new
StringBuffer(ResolveOptions.getDefaultResolveId(md));
+ if (useExtendedResolveId) {
+ ModuleRevisionId mrid = md.getModuleRevisionId();
+ String sts = md.getStatus();
+ String bch = mrid.getBranch();
+ String rev = mrid.getRevision();
+ sb.append("-");
+ if (sts != null) {
+ sb.append(sts);
+ }
+ sb.append("-");
+ if (bch != null) {
+ sb.append(bch);
+ }
+ sb.append("-");
+ if (rev != null) {
+ sb.append(rev);
+ }
+ }
+ return sb.toString();
+ }
}
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvydeContainerPage.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvydeContainerPage.java?rev=1060436&r1=1060435&r2=1060436&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvydeContainerPage.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvydeContainerPage.java
Tue Jan 18 16:10:25 2011
@@ -83,6 +83,8 @@ public class IvydeContainerPage extends
private Button resolveInWorkspaceCheck;
private Button resolveBeforeLaunchCheck;
+
+ private Button useExtendedResolveIdCheck;
private Button advancedProjectSpecificButton;
@@ -209,6 +211,7 @@ public class IvydeContainerPage extends
conf.setAlphaOrder(alphaOrderCheck.getSelectionIndex() == 1);
conf.setResolveInWorkspace(resolveInWorkspaceCheck.getSelection());
conf.setResolveBeforeLaunch(resolveBeforeLaunchCheck.getSelection());
+
conf.setUseExtendedResolveId(useExtendedResolveIdCheck.getSelection());
conf.setRetrievedClasspath(classpathTypeComposite.isRetrievedClasspath());
if (classpathTypeComposite.isRetrievedClasspath()) {
conf.setRetrievedClasspathSetup(classpathTypeComposite.getRetrieveSetup());
@@ -439,6 +442,13 @@ public class IvydeContainerPage extends
resolveBeforeLaunchCheck
.setToolTipText("Trigger a resolve before each run of any kind
of java launch configuration");
+ useExtendedResolveIdCheck = new Button(configComposite, SWT.CHECK);
+ useExtendedResolveIdCheck.setLayoutData(new GridData(GridData.FILL,
GridData.FILL, true,
+ false, 3, 1));
+ useExtendedResolveIdCheck.setText("Use extended resolve id");
+ useExtendedResolveIdCheck
+ .setToolTipText("Will append status, branch and revision info
to the default resolve id");
+
Label label = new Label(configComposite, SWT.NONE);
label.setText("Order of the classpath entries:");
@@ -475,6 +485,7 @@ public class IvydeContainerPage extends
alphaOrderCheck.select(conf.isAlphaOrder() ? 1 : 0);
resolveInWorkspaceCheck.setSelection(conf.isResolveInWorkspace());
resolveBeforeLaunchCheck.setSelection(conf.isResolveBeforeLaunch());
+
useExtendedResolveIdCheck.setSelection(conf.isUseExtendedResolveId());
classpathTypeComposite.init(conf.isRetrievedClasspath(),
conf.getRetrievedClasspathSetup());
} else {
@@ -483,6 +494,7 @@ public class IvydeContainerPage extends
alphaOrderCheck.select(helper.isAlphOrder() ? 1 : 0);
resolveInWorkspaceCheck.setSelection(helper.isResolveInWorkspace());
resolveBeforeLaunchCheck.setSelection(helper.isResolveBeforeLaunch());
+
useExtendedResolveIdCheck.setSelection(helper.isUseExtendedResolveId());
classpathTypeComposite.init(helper.isRetrievedClasspath(),
helper.getRetrievedClasspathSetup());
}
@@ -504,6 +516,7 @@ public class IvydeContainerPage extends
acceptedSuffixesTypesComposite.setEnabled(projectSpecific);
alphaOrderCheck.setEnabled(projectSpecific);
resolveInWorkspaceCheck.setEnabled(projectSpecific);
+ useExtendedResolveIdCheck.setEnabled(projectSpecific);
resolveBeforeLaunchCheck.setEnabled(projectSpecific &&
!FakeProjectManager.isFake(project));
classpathTypeComposite.setEnabled(projectSpecific);
}
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java?rev=1060436&r1=1060435&r2=1060436&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java
Tue Jan 18 16:10:25 2011
@@ -75,6 +75,8 @@ public class IvyResolver {
private boolean useCacheOnly =
IvyPlugin.getPreferenceStoreHelper().isOffline();
+ private boolean useExtendedResolveId = false;
+
public IvyResolver(String ivyXmlPath, List confInput, IProject project) {
this.ivyXmlPath = ivyXmlPath;
this.confInput = confInput;
@@ -189,7 +191,7 @@ public class IvyResolver {
// we check if all required configurations have been resolved
for (int i = 0; i < confs.length; i++) {
File report =
ivy.getResolutionCacheManager().getConfigurationResolveReportInCache(
- ResolveOptions.getDefaultResolveId(md), confs[i]);
+ IvyClasspathUtil.buildResolveId(useExtendedResolveId, md),
confs[i]);
if (report.exists()) {
// found a report, try to parse it.
try {
@@ -215,6 +217,7 @@ public class IvyResolver {
resolveOption.setConfs(confs);
resolveOption.setValidate(ivy.getSettings().doValidate());
resolveOption.setUseCacheOnly(useCacheOnly);
+
resolveOption.setResolveId(IvyClasspathUtil.buildResolveId(useExtendedResolveId,
md));
ResolveReport report = ivy.resolve(md, resolveOption);
ResolveResult result = new ResolveResult(report);
@@ -289,6 +292,7 @@ public class IvyResolver {
List typeList = IvyClasspathUtil.split(retrieveTypes);
options.setArtifactFilter(new ArtifactTypeFilter(typeList));
}
+
options.setResolveId(IvyClasspathUtil.buildResolveId(useExtendedResolveId, md));
// Actually do the retrieve
// FIXME here we will parse a report we already have
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/ClasspathPreferencePage.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/ClasspathPreferencePage.java?rev=1060436&r1=1060435&r2=1060436&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/ClasspathPreferencePage.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/ClasspathPreferencePage.java
Tue Jan 18 16:10:25 2011
@@ -41,6 +41,8 @@ public class ClasspathPreferencePage ext
private Button resolveInWorkspaceCheck;
private Button resolveBeforeLaunchCheck;
+
+ private Button useExtendedResolveIdCheck;
private Combo alphaOrderCheck;
@@ -76,6 +78,13 @@ public class ClasspathPreferencePage ext
resolveBeforeLaunchCheck
.setToolTipText("Trigger a resolve before each run of any kind
of java launch configuration");
+ useExtendedResolveIdCheck = new Button(composite, SWT.CHECK);
+ useExtendedResolveIdCheck.setLayoutData(new GridData(GridData.FILL,
GridData.FILL, true,
+ false, 3, 1));
+ useExtendedResolveIdCheck.setText("Use extended resolve id");
+ useExtendedResolveIdCheck
+ .setToolTipText("Will append status, branch and revision info
to the default resolve id");
+
Label label = new Label(composite, SWT.NONE);
label.setText("Order of the classpath entries:");
@@ -105,6 +114,7 @@ public class ClasspathPreferencePage ext
IvyDEPreferenceStoreHelper helper =
IvyPlugin.getPreferenceStoreHelper();
resolveInWorkspaceCheck.setSelection(helper.isResolveInWorkspace());
resolveBeforeLaunchCheck.setSelection(helper.isResolveBeforeLaunch());
+
useExtendedResolveIdCheck.setSelection(helper.isUseExtendedResolveId());
alphaOrderCheck.select(helper.isAlphOrder() ? 1 : 0);
acceptedSuffixesTypesComposite.init(helper.getContainerMappingSetup());
classpathTypeComposite.init(helper.isRetrievedClasspath(), helper
@@ -115,6 +125,7 @@ public class ClasspathPreferencePage ext
IvyDEPreferenceStoreHelper helper =
IvyPlugin.getPreferenceStoreHelper();
helper.setResolveInWorkspace(resolveInWorkspaceCheck.getSelection());
helper.setResolveBeforeLaunch(resolveBeforeLaunchCheck.getSelection());
+
helper.setUseExtendedResolveId(useExtendedResolveIdCheck.getSelection());
helper.setAlphOrder(alphaOrderCheck.getSelectionIndex() == 1);
helper.setContainerMappingSetup(acceptedSuffixesTypesComposite.getContainerMappingSetup());
helper.setRetrievedClasspath(classpathTypeComposite.isRetrievedClasspath());
@@ -125,6 +136,7 @@ public class ClasspathPreferencePage ext
protected void performDefaults() {
resolveInWorkspaceCheck.setSelection(PreferenceInitializer.DEFAULT_RESOLVE_IN_WORKSPACE);
resolveBeforeLaunchCheck.setSelection(PreferenceInitializer.DEFAULT_RESOLVE_BEFORE_LAUNCH);
+
useExtendedResolveIdCheck.setSelection(PreferenceInitializer.DEFAULT_USE_EXTENDED_RESOLVE_ID);
alphaOrderCheck.select(PreferenceInitializer.DEFAULT_ALPHABETICAL_ORDER ? 1 :
0);
acceptedSuffixesTypesComposite.init(PreferenceInitializer.DEFAULT_CONTAINER_MAPPING_SETUP);
classpathTypeComposite.init(PreferenceInitializer.DEFAULT_RETRIEVED_CLASSPATH,
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=1060436&r1=1060435&r2=1060436&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
Tue Jan 18 16:10:25 2011
@@ -127,6 +127,14 @@ public class IvyDEPreferenceStoreHelper
prefStore.setValue(PreferenceConstants.RESOLVE_BEFORE_LAUNCH,
resolveBeforeLaunch);
}
+ public boolean isUseExtendedResolveId() {
+ return
prefStore.getBoolean(PreferenceConstants.USE_EXTENDED_RESOLVE_ID);
+ }
+
+ public void setUseExtendedResolveId(boolean useExtendedResolveId) {
+ prefStore.setValue(PreferenceConstants.USE_EXTENDED_RESOLVE_ID,
useExtendedResolveId);
+ }
+
public String getOrganization() {
return prefStore.getString(PreferenceConstants.ORGANISATION);
}
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=1060436&r1=1060435&r2=1060436&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
Tue Jan 18 16:10:25 2011
@@ -68,6 +68,8 @@ public final class PreferenceConstants {
public static final String RESOLVE_BEFORE_LAUNCH = "resolveBeforeLaunch";
+ public static final String USE_EXTENDED_RESOLVE_ID =
"useExtendedResolveId";
+
public static final String PROPERTY_FILES = "propertyFiles";
public static final String LOAD_SETTINGS_ON_DEMAND =
"loadSettingsOnDemand";
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceInitializer.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceInitializer.java?rev=1060436&r1=1060435&r2=1060436&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceInitializer.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceInitializer.java
Tue Jan 18 16:10:25 2011
@@ -91,6 +91,8 @@ public class PreferenceInitializer exten
public static final boolean DEFAULT_RESOLVE_BEFORE_LAUNCH = false;
+ public static final boolean DEFAULT_USE_EXTENDED_RESOLVE_ID = false;
+
public static final int DEFAULT_RESOLVE_ON_STARTUP = 1;
public static final boolean DEFAULT_AUTO_RESOLVE_ON_CLOSE = true;
