ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1195176 [1/3] - in /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse: ./ src/java/org/apache/ivyde/eclipse/ src/java/org/apache/ivyde/eclipse/cpcontainer/ src/java/org/apache/ivyde/eclipse/retrieve/ src/java/org/apache/ivyde/eclipse/ui/ src/ja...
Date Sun, 30 Oct 2011 15:25:44 GMT
Author: hibou
Date: Sun Oct 30 15:25:43 2011
New Revision: 1195176

URL: http://svn.apache.org/viewvc?rev=1195176&view=rev
Log:
- Split the advanced tab into three tabs : a "classpath" one, a "source/javadoc mapping" one, and an (still) "advanced" one.
- Same split done in the global preference pages.

Added:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/AdvancedSetup.java   (with props)
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/ClasspathSetup.java   (with props)
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/MappingSetup.java   (contents, props changed)
      - copied, changed from r1183639, ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/ContainerMappingSetup.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/SettingsSetup.java   (contents, props changed)
      - copied, changed from r1183639, ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvySettingsSetup.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AbstractSetupTab.java   (with props)
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AdvancedSetupEditor.java   (with props)
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AdvancedSetupTab.java   (with props)
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathSetupEditor.java   (with props)
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathSetupTab.java   (with props)
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/MappingSetupEditor.java   (contents, props changed)
      - copied, changed from r1183641, ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AcceptedSuffixesTypesComposite.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/MappingSetupTab.java   (with props)
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsSetupEditor.java   (contents, props changed)
      - copied, changed from r1190201, ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsEditor.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsSetupTab.java   (contents, props changed)
      - copied, changed from r1190201, ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/IvySettingsTab.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/AdvancedSetupPreferencePage.java   (with props)
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/ClasspathSetupPreferencePage.java   (contents, props changed)
      - copied, changed from r1183639, 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/MappingSetupPreferencePage.java   (with props)
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/SettingsSetupPreferencePage.java   (contents, props changed)
      - copied, changed from r1190201, ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/SettingsPreferencePage.java
Removed:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/ContainerMappingSetup.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvySettingsSetup.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AcceptedSuffixesTypesComposite.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/IvySettingsTab.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsEditor.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/SettingsPreferencePage.java
Modified:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/plugin.xml
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDERuntimeClasspathEntryResolver.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/ClasspathEntriesResolver.java
    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/IvyClasspathContainerMapper.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerState.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/retrieve/StandaloneRetrieveSerializer.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/StandaloneRetrieveSetup.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/StandaloneRetrieveSetupState.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/EditStandaloneRetrieveDialog.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/PreferenceInitializer.java

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/plugin.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/plugin.xml?rev=1195176&r1=1195175&r2=1195176&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/plugin.xml (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/plugin.xml Sun Oct 30 15:25:43 2011
@@ -101,15 +101,15 @@
       </page>
       <page
             category="org.apache.ivyde.eclipse.ui.preferences.IvyPreferencePage"
-            class="org.apache.ivyde.eclipse.ui.preferences.ClasspathPreferencePage"
-            id="org.apache.ivyde.eclipse.ui.preferences.ClasspathPreferencePage"
-            name="Classpath">
+            class="org.apache.ivyde.eclipse.ui.preferences.SettingsSetupPreferencePage"
+            id="org.apache.ivyde.eclipse.ui.preferences.SettingsSetupPreferencePage"
+            name="Settings">
       </page>
       <page
             category="org.apache.ivyde.eclipse.ui.preferences.IvyPreferencePage"
-            class="org.apache.ivyde.eclipse.ui.preferences.SettingsPreferencePage"
-            id="org.apache.ivyde.eclipse.ui.preferences.SettingsPreferencePage"
-            name="Settings">
+            class="org.apache.ivyde.eclipse.ui.preferences.ClasspathSetupPreferencePage"
+            id="org.apache.ivyde.eclipse.ui.preferences.ClasspathSetupPreferencePage"
+            name="Classpath Container">
       </page>
       <page
             name="Workspace Resolver"
@@ -119,10 +119,22 @@
       </page>
       <page
             category="org.apache.ivyde.eclipse.ui.preferences.IvyPreferencePage"
+            class="org.apache.ivyde.eclipse.ui.preferences.MappingSetupPreferencePage"
+            id="org.apache.ivyde.eclipse.ui.preferences.MappingSetupPreferencePage"
+            name="Source/Javadoc Mapping">
+      </page>
+      <page
+            category="org.apache.ivyde.eclipse.ui.preferences.IvyPreferencePage"
             class="org.apache.ivyde.eclipse.ui.preferences.XMLEditorPreferencesPage"
             id="org.apache.ivyde.eclipse.ui.preferences.XMLEditorPreferencesPage"
             name="XML Editor">
       </page>
+      <page
+            category="org.apache.ivyde.eclipse.ui.preferences.IvyPreferencePage"
+            class="org.apache.ivyde.eclipse.ui.preferences.AdvancedSetupPreferencePage"
+            id="org.apache.ivyde.eclipse.ui.preferences.AdvancedSetupPreferencePage"
+            name="Advanced">
+      </page>
    </extension>
    <extension
          point="org.eclipse.core.runtime.preferences">

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDERuntimeClasspathEntryResolver.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDERuntimeClasspathEntryResolver.java?rev=1195176&r1=1195175&r2=1195176&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDERuntimeClasspathEntryResolver.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDERuntimeClasspathEntryResolver.java Sun Oct 30 15:25:43 2011
@@ -81,11 +81,13 @@ public class IvyDERuntimeClasspathEntryR
     private static IRuntimeClasspathEntry[] computeDefaultContainerEntries(
             IvyClasspathContainer ivycp, IRuntimeClasspathEntry entry) throws CoreException {
         IClasspathEntry[] cpes;
-        if (ivycp.getClasspathEntries() == null || ivycp.getConf().isInheritedResolveBeforeLaunch()) {
+        if (ivycp.getClasspathEntries() == null
+                || ivycp.getConf().getInheritedAdvancedSetup().isResolveBeforeLaunch()) {
             ClasspathEntriesResolver resolver = new ClasspathEntriesResolver(ivycp, false);
             ResolveRequest request = new ResolveRequest(resolver, ivycp.getState());
             request.setForceFailOnError(true);
-            request.setInWorkspace(ivycp.getConf().isInheritedResolveInWorkspace());
+            request.setInWorkspace(ivycp.getConf().getInheritedClasspathSetup()
+                    .isResolveInWorkspace());
             IvyResolveJob resolveJob = IvyPlugin.getDefault().getIvyResolveJob();
             IStatus status = resolveJob.launchRequest(request, new NullProgressMonitor());
             if (status.getCode() != IStatus.OK) {

Added: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/AdvancedSetup.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/AdvancedSetup.java?rev=1195176&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/AdvancedSetup.java (added)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/AdvancedSetup.java Sun Oct 30 15:25:43 2011
@@ -0,0 +1,50 @@
+/*
+ *  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.
+ *
+ */
+package org.apache.ivyde.eclipse.cpcontainer;
+
+public class AdvancedSetup {
+
+    private boolean resolveBeforeLaunch;
+
+    private boolean useExtendedResolveId;
+
+    public AdvancedSetup() {
+        // default constructor
+    }
+
+    public void set(AdvancedSetup setup) {
+        this.resolveBeforeLaunch = setup.resolveBeforeLaunch;
+        this.useExtendedResolveId = setup.useExtendedResolveId;
+    }
+
+    public boolean isResolveBeforeLaunch() {
+        return resolveBeforeLaunch;
+    }
+
+    public void setResolveBeforeLaunch(boolean resolveBeforeLaunch) {
+        this.resolveBeforeLaunch = resolveBeforeLaunch;
+    }
+
+    public boolean isUseExtendedResolveId() {
+        return useExtendedResolveId;
+    }
+
+    public void setUseExtendedResolveId(boolean useExtendedResolveId) {
+        this.useExtendedResolveId = useExtendedResolveId;
+    }
+}

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/AdvancedSetup.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/AdvancedSetup.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/AdvancedSetup.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/ClasspathEntriesResolver.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/ClasspathEntriesResolver.java?rev=1195176&r1=1195175&r2=1195176&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/ClasspathEntriesResolver.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/ClasspathEntriesResolver.java Sun Oct 30 15:25:43 2011
@@ -49,10 +49,10 @@ public class ClasspathEntriesResolver ex
         super(ivycp.getConf().getIvyXmlPath(), ivycp.getConf().getConfs(), ivycp.getConf()
                 .getJavaProject() == null ? null : ivycp.getConf().getJavaProject().getProject());
         this.conf = ivycp.getConf();
-        setUsePreviousResolveIfExist(ivycp.getConf().isInheritedUseExtendedResolveId());
+        setUsePreviousResolveIfExist(ivycp.getConf().getInheritedAdvancedSetup().isUseExtendedResolveId());
         setUsePreviousResolveIfExist(usePreviousResolveIfExist);
-        if (conf.isInheritedRetrievedClasspath()) {
-            RetrieveSetup setup = conf.getInheritedRetrievedClasspathSetup();
+        if (conf.getInheritedClasspathSetup().isRetrievedClasspath()) {
+            RetrieveSetup setup = conf.getInheritedClasspathSetup().getRetrieveSetup();
             setRetrievePattern(setup.getRetrievePattern());
             setRetrieveSync(setup.isRetrieveSync());
             setRetrieveTypes(setup.getRetrieveTypes());

Added: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/ClasspathSetup.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/ClasspathSetup.java?rev=1195176&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/ClasspathSetup.java (added)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/ClasspathSetup.java Sun Oct 30 15:25:43 2011
@@ -0,0 +1,91 @@
+/*
+ *  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.
+ *
+ */
+package org.apache.ivyde.eclipse.cpcontainer;
+
+import java.util.List;
+
+import org.apache.ivyde.eclipse.retrieve.RetrieveSetup;
+
+public class ClasspathSetup {
+
+    private boolean resolveInWorkspace;
+
+    private List/* <String> */acceptedTypes;
+
+    private boolean alphaOrder;
+
+    private boolean retrievedClasspath;
+
+    private RetrieveSetup retrieveSetup = new RetrieveSetup();
+
+    /**
+     * Default constructor
+     */
+    public ClasspathSetup() {
+        // default constructor
+    }
+
+    public void set(ClasspathSetup setup) {
+        this.resolveInWorkspace = setup.resolveInWorkspace;
+        this.acceptedTypes = setup.acceptedTypes;
+        this.alphaOrder = setup.alphaOrder;
+        this.retrievedClasspath = setup.retrievedClasspath;
+        this.retrieveSetup.set(setup.retrieveSetup);
+    }
+
+    public boolean isResolveInWorkspace() {
+        return resolveInWorkspace;
+    }
+
+    public void setResolveInWorkspace(boolean resolveInWorkspace) {
+        this.resolveInWorkspace = resolveInWorkspace;
+    }
+
+    public List getAcceptedTypes() {
+        return acceptedTypes;
+    }
+
+    public void setAcceptedTypes(List acceptedTypes) {
+        this.acceptedTypes = acceptedTypes;
+    }
+
+    public boolean isAlphaOrder() {
+        return alphaOrder;
+    }
+
+    public void setAlphaOrder(boolean alphaOrder) {
+        this.alphaOrder = alphaOrder;
+    }
+
+    public boolean isRetrievedClasspath() {
+        return retrievedClasspath;
+    }
+
+    public void setRetrievedClasspath(boolean retrievedClasspath) {
+        this.retrievedClasspath = retrievedClasspath;
+    }
+
+    public RetrieveSetup getRetrieveSetup() {
+        return retrieveSetup;
+    }
+
+    public void setRetrieveSetup(RetrieveSetup retrieveSetup) {
+        this.retrieveSetup = retrieveSetup;
+    }
+
+}

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/ClasspathSetup.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/ClasspathSetup.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/ClasspathSetup.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

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=1195176&r1=1195175&r2=1195176&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 Sun Oct 30 15:25:43 2011
@@ -122,7 +122,7 @@ public class IvyClasspathContainer imple
     public IStatus launchResolve(boolean usePreviousResolveIfExist, IProgressMonitor monitor) {
         ResolveRequest request = new ResolveRequest(new IvyClasspathResolver(this,
                 usePreviousResolveIfExist), getState());
-        request.setInWorkspace(getConf().isInheritedResolveInWorkspace());
+        request.setInWorkspace(getConf().getInheritedClasspathSetup().isResolveInWorkspace());
         IvyResolveJob resolveJob = IvyPlugin.getDefault().getIvyResolveJob();
         if (monitor != null) {
             return resolveJob.launchRequest(request, monitor);
@@ -144,7 +144,7 @@ public class IvyClasspathContainer imple
     private void setClasspathEntries(final IClasspathEntry[] entries) {
         Display.getDefault().syncExec(new Runnable() {
             public void run() {
-                if (conf.isInheritedAlphaOrder()) {
+                if (conf.getInheritedClasspathSetup().isAlphaOrder()) {
                     Arrays.sort(entries, new Comparator() {
                         public int compare(Object o1, Object o2) {
                             return ((IClasspathEntry) o1).getPath().lastSegment()
@@ -181,8 +181,8 @@ public class IvyClasspathContainer imple
         if (md == null) {
             return null;
         }
-        String resolveId = IvyClasspathUtil.buildResolveId(conf.isInheritedUseExtendedResolveId(),
-            md);
+        String resolveId = IvyClasspathUtil.buildResolveId(conf.getInheritedAdvancedSetup()
+                .isUseExtendedResolveId(), 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=1195176&r1=1195175&r2=1195176&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 Sun Oct 30 15:25:43 2011
@@ -98,9 +98,10 @@ public final class IvyClasspathContainer
      *            the path of the container
      */
     private static void loadV1(IvyClasspathContainerConfiguration conf, IPath path) {
-        ContainerMappingSetup mappingSetup = conf.getContainerMappingSetup();
-        IvySettingsSetup settingsSetup = conf.getIvySettingsSetup();
-        RetrieveSetup retrievedClasspathSetup = conf.getRetrievedClasspathSetup();
+        SettingsSetup settingsSetup = conf.getIvySettingsSetup();
+        ClasspathSetup classpathSetup = conf.getClasspathSetup();
+        MappingSetup mappingSetup = conf.getMappingSetup();
+        AdvancedSetup advancedSetup = conf.getAdvancedSetup();
 
         String url = path.segment(1).substring(1);
         String[] parameters = url.split("&");
@@ -151,49 +152,50 @@ public final class IvyClasspathContainer
                 settingsSetup.setPropertyFiles(IvyClasspathUtil.split(value));
                 conf.setSettingsProjectSpecific(true);
             } else if (parameter[0].equals("acceptedTypes")) {
-                mappingSetup.setAcceptedTypes(IvyClasspathUtil.split(value));
-                conf.setAdvancedProjectSpecific(true);
+                classpathSetup.setAcceptedTypes(IvyClasspathUtil.split(value));
+                conf.setClassthProjectSpecific(true);
             } else if (parameter[0].equals("sourceTypes")) {
                 mappingSetup.setSourceTypes(IvyClasspathUtil.split(value));
-                conf.setAdvancedProjectSpecific(true);
+                conf.setMappingProjectSpecific(true);
             } else if (parameter[0].equals("javadocTypes")) {
                 mappingSetup.setJavadocTypes(IvyClasspathUtil.split(value));
-                conf.setAdvancedProjectSpecific(true);
+                conf.setMappingProjectSpecific(true);
             } else if (parameter[0].equals("sourceSuffixes")) {
                 mappingSetup.setSourceSuffixes(IvyClasspathUtil.split(value));
-                conf.setAdvancedProjectSpecific(true);
+                conf.setMappingProjectSpecific(true);
             } else if (parameter[0].equals("javadocSuffixes")) {
                 mappingSetup.setJavadocSuffixes(IvyClasspathUtil.split(value));
-                conf.setAdvancedProjectSpecific(true);
+                conf.setMappingProjectSpecific(true);
             } else if (parameter[0].equals("alphaOrder")) {
                 // if the value is not actually "true" or "false", the Boolean class ensure to
                 // return false, so it is fine
-                conf.setAlphaOrder(Boolean.valueOf(value).booleanValue());
-                conf.setAdvancedProjectSpecific(true);
+                classpathSetup.setAlphaOrder(Boolean.valueOf(value).booleanValue());
+                conf.setClassthProjectSpecific(true);
             } else if (parameter[0].equals("resolveInWorkspace")) {
-                conf.setResolveInWorkspace(Boolean.valueOf(value).booleanValue());
-                conf.setAdvancedProjectSpecific(true);
+                classpathSetup.setResolveInWorkspace(Boolean.valueOf(value).booleanValue());
+                conf.setClassthProjectSpecific(true);
             } else if (parameter[0].equals("resolveBeforeLaunch")) {
-                conf.setResolveBeforeLaunch(Boolean.valueOf(value).booleanValue());
+                advancedSetup.setResolveBeforeLaunch(Boolean.valueOf(value).booleanValue());
                 conf.setAdvancedProjectSpecific(true);
             } else if (parameter[0].equals("retrievedClasspath")) {
-                conf.setRetrievedClasspath(Boolean.valueOf(value).booleanValue());
-                conf.setAdvancedProjectSpecific(true);
+                classpathSetup.setRetrievedClasspath(Boolean.valueOf(value).booleanValue());
+                conf.setClassthProjectSpecific(true);
             } else if (parameter[0].equals("retrievedClasspathPattern")) {
-                retrievedClasspathSetup.setRetrievePattern(value);
-                conf.setAdvancedProjectSpecific(true);
+                classpathSetup.getRetrieveSetup().setRetrievePattern(value);
+                conf.setClassthProjectSpecific(true);
             } else if (parameter[0].equals("retrievedClasspathSync")) {
-                retrievedClasspathSetup.setRetrieveSync(Boolean.valueOf(value).booleanValue());
-                conf.setAdvancedProjectSpecific(true);
+                classpathSetup.getRetrieveSetup().setRetrieveSync(
+                    Boolean.valueOf(value).booleanValue());
+                conf.setClassthProjectSpecific(true);
             } else if (parameter[0].equals("retrievedClasspathTypes")) {
-                retrievedClasspathSetup.setRetrieveTypes(value);
-                conf.setAdvancedProjectSpecific(true);
+                classpathSetup.getRetrieveSetup().setRetrieveTypes(value);
+                conf.setClassthProjectSpecific(true);
             } else if (parameter[0].equals("mapIfOnlyOneSource")) {
                 mappingSetup.setMapIfOnlyOneSource(Boolean.valueOf(value).booleanValue());
-                conf.setAdvancedProjectSpecific(true);
+                conf.setMappingProjectSpecific(true);
             } else if (parameter[0].equals("mapIfOnlyOneJavadoc")) {
                 mappingSetup.setMapIfOnlyOneJavadoc(Boolean.valueOf(value).booleanValue());
-                conf.setAdvancedProjectSpecific(true);
+                conf.setMappingProjectSpecific(true);
 
                 // the following is the retrieve conf pre -IVYDE-56
                 // from this conf should be build StandaloneRetrieveSetup
@@ -215,9 +217,8 @@ public final class IvyClasspathContainer
             } else if (parameter[0].equals("retrieveTypes")) {
                 standaloneRetrieveSetup.setRetrieveTypes(value);
                 isRetrieveProjectSpecific = true;
-            }
-            else if (parameter[0].equals("useExtendedResolveId")) {
-                conf.setUseExtendedResolveId(Boolean.valueOf(value).booleanValue());
+            } else if (parameter[0].equals("useExtendedResolveId")) {
+                advancedSetup.setUseExtendedResolveId(Boolean.valueOf(value).booleanValue());
                 conf.setAdvancedProjectSpecific(true);
             }
         }
@@ -233,7 +234,7 @@ public final class IvyClasspathContainer
 
     private static void convertOldRetrieveConf(IvyClasspathContainerConfiguration conf,
             boolean isRetrieveProjectSpecific, boolean doStandaloneRetrieve,
-            RetrieveSetup retrieveSetup, IvySettingsSetup settingsSetup, String ivyXmlPath) {
+            RetrieveSetup retrieveSetup, SettingsSetup settingsSetup, String ivyXmlPath) {
         if (conf.getJavaProject() == null) {
             // no project means no retrieve possible
             return;
@@ -241,7 +242,7 @@ public final class IvyClasspathContainer
 
         StandaloneRetrieveSetup setup = new StandaloneRetrieveSetup();
         setup.setName("dependencies");
-        setup.setIvySettingsSetup(settingsSetup);
+        setup.setSettingsSetup(settingsSetup);
         setup.setIvyXmlPath(ivyXmlPath);
         setup.setSettingsProjectSpecific(conf.isSettingsProjectSpecific());
         setup.setProject(conf.getJavaProject().getProject());
@@ -325,16 +326,18 @@ public final class IvyClasspathContainer
     }
 
     private static void checkNonNullConf(IvyClasspathContainerConfiguration conf) {
-        ContainerMappingSetup mappingSetup = conf.getContainerMappingSetup();
-        IvySettingsSetup settingsSetup = conf.getIvySettingsSetup();
-        ContainerMappingSetup prefStoreMappingSetup = IvyPlugin.getPreferenceStoreHelper()
-                .getContainerMappingSetup();
+        ClasspathSetup classpathSetup = conf.getClasspathSetup();
+        ClasspathSetup prefStoreClasspathSetup = IvyPlugin.getPreferenceStoreHelper()
+                .getClasspathSetup();
+        MappingSetup mappingSetup = conf.getMappingSetup();
+        SettingsSetup settingsSetup = conf.getIvySettingsSetup();
+        MappingSetup prefStoreMappingSetup = IvyPlugin.getPreferenceStoreHelper().getMappingSetup();
         if (settingsSetup.getRawPropertyFiles() == null) {
-            settingsSetup.setPropertyFiles(IvyPlugin.getPreferenceStoreHelper()
-                    .getIvySettingsSetup().getRawPropertyFiles());
+            settingsSetup.setPropertyFiles(IvyPlugin.getPreferenceStoreHelper().getSettingsSetup()
+                    .getRawPropertyFiles());
         }
-        if (mappingSetup.getAcceptedTypes() == null) {
-            mappingSetup.setAcceptedTypes(prefStoreMappingSetup.getAcceptedTypes());
+        if (classpathSetup.getAcceptedTypes() == null) {
+            classpathSetup.setAcceptedTypes(prefStoreClasspathSetup.getAcceptedTypes());
         }
         if (mappingSetup.getSourceTypes() == null) {
             mappingSetup.setSourceTypes(prefStoreMappingSetup.getSourceTypes());
@@ -363,31 +366,37 @@ public final class IvyClasspathContainer
             path.append(URLEncoder.encode(conf.getIvyXmlPath(), "UTF-8"));
             append(path, "confs", conf.getConfs());
             if (conf.isSettingsProjectSpecific()) {
-                IvySettingsSetup setup = conf.getIvySettingsSetup();
+                SettingsSetup setup = conf.getIvySettingsSetup();
                 append(path, "ivySettingsPath", setup.getRawIvySettingsPath());
                 append(path, "loadSettingsOnDemand", setup.isLoadSettingsOnDemand());
                 append(path, "propertyFiles", setup.getRawPropertyFiles());
             }
-            if (conf.isAdvancedProjectSpecific()) {
-                ContainerMappingSetup setup = conf.getContainerMappingSetup();
+            if (conf.isClassthProjectSpecific()) {
+                ClasspathSetup setup = conf.getClasspathSetup();
                 append(path, "acceptedTypes", setup.getAcceptedTypes());
-                append(path, "sourceTypes", setup.getSourceTypes());
-                append(path, "javadocTypes", setup.getJavadocTypes());
-                append(path, "sourceSuffixes", setup.getSourceSuffixes());
-                append(path, "javadocSuffixes", setup.getJavadocSuffixes());
-                append(path, "alphaOrder", conf.isAlphaOrder());
-                append(path, "resolveInWorkspace", conf.isResolveInWorkspace());
-                append(path, "resolveBeforeLaunch", conf.isResolveBeforeLaunch());
-                append(path, "retrievedClasspath", conf.isRetrievedClasspath());
-                if (conf.isRetrievedClasspath()) {
-                    RetrieveSetup retrieveSetup = conf.getRetrievedClasspathSetup();
+                append(path, "alphaOrder", setup.isAlphaOrder());
+                append(path, "resolveInWorkspace", setup.isResolveInWorkspace());
+                append(path, "retrievedClasspath", setup.isRetrievedClasspath());
+                if (setup.isRetrievedClasspath()) {
+                    RetrieveSetup retrieveSetup = setup.getRetrieveSetup();
                     append(path, "retrievedClasspathPattern", retrieveSetup.getRetrievePattern());
                     append(path, "retrievedClasspathSync", retrieveSetup.isRetrieveSync());
                     append(path, "retrievedClasspathTypes", retrieveSetup.getRetrieveTypes());
                 }
+            }
+            if (conf.isMappingProjectSpecific()) {
+                MappingSetup setup = conf.getMappingSetup();
+                append(path, "sourceTypes", setup.getSourceTypes());
+                append(path, "javadocTypes", setup.getJavadocTypes());
+                append(path, "sourceSuffixes", setup.getSourceSuffixes());
+                append(path, "javadocSuffixes", setup.getJavadocSuffixes());
                 append(path, "mapIfOnlyOneSource", setup.isMapIfOnlyOneSource());
                 append(path, "mapIfOnlyOneJavadoc", setup.isMapIfOnlyOneJavadoc());
-                append(path, "useExtendedResolveId", conf.isUseExtendedResolveId());
+            }
+            if (conf.isAdvancedProjectSpecific()) {
+                AdvancedSetup setup = conf.getAdvancedSetup();
+                append(path, "resolveBeforeLaunch", setup.isResolveBeforeLaunch());
+                append(path, "useExtendedResolveId", setup.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=1195176&r1=1195175&r2=1195176&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 Sun Oct 30 15:25:43 2011
@@ -18,12 +18,9 @@
 package org.apache.ivyde.eclipse.cpcontainer;
 
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 
-import org.apache.ivyde.eclipse.IvyDEException;
 import org.apache.ivyde.eclipse.IvyPlugin;
-import org.apache.ivyde.eclipse.retrieve.RetrieveSetup;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.jdt.core.IClasspathAttribute;
@@ -37,35 +34,31 @@ public class IvyClasspathContainerConfig
 
     private IJavaProject javaProject;
 
-    private IvySettingsSetup ivySettingsSetup = new IvySettingsSetup();
-
-    private ContainerMappingSetup containerMappingSetup = new ContainerMappingSetup();
-
     private String ivyXmlPath;
 
     private List/* <String> */confs = Arrays.asList(new String[] {"*"});
 
-    private boolean alphaOrder;
+    private SettingsSetup settingsSetup = new SettingsSetup();
+
+    private ClasspathSetup classpathSetup = new ClasspathSetup();
+
+    private MappingSetup mappingSetup = new MappingSetup();
 
-    private boolean resolveInWorkspace;
+    private AdvancedSetup advancedSetup = new AdvancedSetup();
 
-    private boolean isAdvancedProjectSpecific;
+    private boolean settingsProjectSpecific;
 
-    private boolean isSettingsProjectSpecific;
+    private boolean classthProjectSpecific;
 
-    private boolean resolveBeforeLaunch;
+    private boolean mappingProjectSpecific;
 
-    private boolean useExtendedResolveId;
+    private boolean advancedProjectSpecific;
 
     /**
      * attributes attached to the container but not IvyDE related (Webtools or AspectJfor instance)
      */
     private IClasspathAttribute[] attributes = new IClasspathAttribute[0];
 
-    private boolean retrievedClasspath;
-
-    private RetrieveSetup retrievedClasspathSetup = new RetrieveSetup();
-
     /**
      * Constructor
      * 
@@ -121,68 +114,68 @@ public class IvyClasspathContainerConfig
         this.confs = confs;
     }
 
-    public IvySettingsSetup getIvySettingsSetup() {
-        return ivySettingsSetup;
+    public SettingsSetup getIvySettingsSetup() {
+        return settingsSetup;
     }
 
-    public void setIvySettingsSetup(IvySettingsSetup ivySettingsSetup) {
-        this.ivySettingsSetup = ivySettingsSetup;
+    public void setIvySettingsSetup(SettingsSetup ivySettingsSetup) {
+        this.settingsSetup = ivySettingsSetup;
     }
 
-    public ContainerMappingSetup getContainerMappingSetup() {
-        return containerMappingSetup;
+    public ClasspathSetup getClasspathSetup() {
+        return classpathSetup;
     }
 
-    public void setContainerMappingSetup(ContainerMappingSetup containerMappingSetup) {
-        this.containerMappingSetup = containerMappingSetup;
+    public void setClasspathSetup(ClasspathSetup classpathSetup) {
+        this.classpathSetup = classpathSetup;
     }
 
-    public boolean isAlphaOrder() {
-        return alphaOrder;
+    public MappingSetup getMappingSetup() {
+        return mappingSetup;
     }
 
-    public void setAlphaOrder(boolean alphaOrder) {
-        this.alphaOrder = alphaOrder;
+    public void setMappingSetup(MappingSetup mappingSetup) {
+        this.mappingSetup = mappingSetup;
     }
 
-    public boolean isResolveInWorkspace() {
-        return resolveInWorkspace;
+    public AdvancedSetup getAdvancedSetup() {
+        return advancedSetup;
     }
 
-    public void setResolveInWorkspace(boolean resolveInWorkspace) {
-        this.resolveInWorkspace = resolveInWorkspace;
+    public void setAdvancedSetup(AdvancedSetup advancedSetup) {
+        this.advancedSetup = advancedSetup;
     }
 
-    public boolean isAdvancedProjectSpecific() {
-        return isAdvancedProjectSpecific;
+    public boolean isClassthProjectSpecific() {
+        return classthProjectSpecific;
     }
 
-    public void setAdvancedProjectSpecific(boolean isAdvancedProjectSpecific) {
-        this.isAdvancedProjectSpecific = isAdvancedProjectSpecific;
+    public void setClassthProjectSpecific(boolean classthProjectSpecific) {
+        this.classthProjectSpecific = classthProjectSpecific;
     }
 
-    public boolean isSettingsProjectSpecific() {
-        return isSettingsProjectSpecific;
+    public boolean isMappingProjectSpecific() {
+        return mappingProjectSpecific;
     }
 
-    public void setSettingsProjectSpecific(boolean isSettingsProjectSpecific) {
-        this.isSettingsProjectSpecific = isSettingsProjectSpecific;
+    public void setMappingProjectSpecific(boolean mappingProjectSpecific) {
+        this.mappingProjectSpecific = mappingProjectSpecific;
     }
 
-    public boolean isResolveBeforeLaunch() {
-        return resolveBeforeLaunch;
+    public boolean isSettingsProjectSpecific() {
+        return settingsProjectSpecific;
     }
 
-    public void setResolveBeforeLaunch(boolean resolveBeforeLaunch) {
-        this.resolveBeforeLaunch = resolveBeforeLaunch;
+    public void setSettingsProjectSpecific(boolean isSettingsProjectSpecific) {
+        this.settingsProjectSpecific = isSettingsProjectSpecific;
     }
-    
-    public boolean isUseExtendedResolveId() {
-        return useExtendedResolveId;
+
+    public boolean isAdvancedProjectSpecific() {
+        return advancedProjectSpecific;
     }
 
-    public void setUseExtendedResolveId(boolean useExtendedResolveId) {
-        this.useExtendedResolveId = useExtendedResolveId;
+    public void setAdvancedProjectSpecific(boolean advancedProjectSpecific) {
+        this.advancedProjectSpecific = advancedProjectSpecific;
     }
 
     public IJavaProject getJavaProject() {
@@ -201,153 +194,43 @@ public class IvyClasspathContainerConfig
         return attributes;
     }
 
-    public boolean isRetrievedClasspath() {
-        return retrievedClasspath;
-    }
-
-    public void setRetrievedClasspath(boolean retrievedClasspath) {
-        this.retrievedClasspath = retrievedClasspath;
-    }
-
-    public RetrieveSetup getRetrievedClasspathSetup() {
-        return retrievedClasspathSetup;
-    }
-
-    public void setRetrievedClasspathSetup(RetrieveSetup retrievedClasspathSetup) {
-        this.retrievedClasspathSetup = retrievedClasspathSetup;
-    }
-
     // ///////////////////////////
     // Getters that take into account the global preferences
     // ///////////////////////////
 
-    private IProject getProject() {
+    public IProject getProject() {
         if (javaProject == null) {
             return null;
         }
         return javaProject.getProject();
     }
 
-    public String getInheritedIvySettingsPath() throws IvyDEException {
-        if (!isSettingsProjectSpecific) {
-            return IvyPlugin.getPreferenceStoreHelper().getIvySettingsSetup()
-                    .getResolvedIvySettingsPath(getProject());
-        }
-        return ivySettingsSetup.getResolvedIvySettingsPath(getProject());
-    }
-
-    public boolean getInheritedLoadSettingsOnDemandPath() {
-        if (!isSettingsProjectSpecific) {
-            return IvyPlugin.getPreferenceStoreHelper().getIvySettingsSetup()
-                    .isLoadSettingsOnDemand();
-        }
-        return ivySettingsSetup.isLoadSettingsOnDemand();
-    }
-
-    public Collection getInheritedPropertyFiles() throws IvyDEException {
-        if (!isSettingsProjectSpecific) {
-            return IvyPlugin.getPreferenceStoreHelper().getIvySettingsSetup()
-                    .getResolvedPropertyFiles();
-        } else {
-            return ivySettingsSetup.getResolvedPropertyFiles();
-        }
-    }
-
-    public Collection getInheritedAcceptedTypes() {
-        if (!isAdvancedProjectSpecific) {
-            return IvyPlugin.getPreferenceStoreHelper().getContainerMappingSetup()
-                    .getAcceptedTypes();
-        }
-        return containerMappingSetup.getAcceptedTypes();
-    }
-
-    public Collection getInheritedSourceTypes() {
-        if (!isAdvancedProjectSpecific) {
-            return IvyPlugin.getPreferenceStoreHelper().getContainerMappingSetup().getSourceTypes();
-        }
-        return containerMappingSetup.getSourceTypes();
-    }
-
-    public Collection getInheritedSourceSuffixes() {
-        if (!isAdvancedProjectSpecific) {
-            return IvyPlugin.getPreferenceStoreHelper().getContainerMappingSetup()
-                    .getSourceSuffixes();
-        }
-        return containerMappingSetup.getSourceSuffixes();
-    }
-
-    public Collection getInheritedJavadocTypes() {
-        if (!isAdvancedProjectSpecific) {
-            return IvyPlugin.getPreferenceStoreHelper().getContainerMappingSetup()
-                    .getJavadocTypes();
-        }
-        return containerMappingSetup.getJavadocTypes();
-    }
-
-    public Collection getInheritedJavadocSuffixes() {
-        if (!isAdvancedProjectSpecific) {
-            return IvyPlugin.getPreferenceStoreHelper().getContainerMappingSetup()
-                    .getJavadocSuffixes();
-        }
-        return containerMappingSetup.getJavadocSuffixes();
-    }
-
-    public boolean isInheritedAlphaOrder() {
-        if (!isAdvancedProjectSpecific) {
-            return IvyPlugin.getPreferenceStoreHelper().isAlphOrder();
-        }
-        return alphaOrder;
-    }
-
-    public boolean isInheritedResolveInWorkspace() {
-        if (!isAdvancedProjectSpecific) {
-            return IvyPlugin.getPreferenceStoreHelper().isResolveInWorkspace();
-        }
-        return resolveInWorkspace;
-    }
-
-    public boolean isInheritedResolveBeforeLaunch() {
-        if (!isAdvancedProjectSpecific) {
-            return IvyPlugin.getPreferenceStoreHelper().isResolveBeforeLaunch();
-        }
-        return resolveBeforeLaunch;
-    }
-
-    public boolean isInheritedRetrievedClasspath() {
-        if (!isAdvancedProjectSpecific) {
-            return IvyPlugin.getPreferenceStoreHelper().isRetrievedClasspath();
-        }
-        return retrievedClasspath;
-    }
-
-    public RetrieveSetup getInheritedRetrievedClasspathSetup() {
-        if (!isAdvancedProjectSpecific) {
-            return IvyPlugin.getPreferenceStoreHelper().getRetrievedClasspathSetup();
+    public SettingsSetup getInheritedSettingsSetup() {
+        if (!settingsProjectSpecific) {
+            return IvyPlugin.getPreferenceStoreHelper().getSettingsSetup();
         }
-        return retrievedClasspathSetup;
+        return settingsSetup;
     }
 
-    public boolean isInheritedMapIfOnlyOneSource() {
-        if (!isAdvancedProjectSpecific) {
-            return IvyPlugin.getPreferenceStoreHelper().getContainerMappingSetup()
-                    .isMapIfOnlyOneSource();
+    public ClasspathSetup getInheritedClasspathSetup() {
+        if (!classthProjectSpecific) {
+            return IvyPlugin.getPreferenceStoreHelper().getClasspathSetup();
         }
-        return containerMappingSetup.isMapIfOnlyOneSource();
+        return classpathSetup;
     }
 
-    public boolean isInheritedMapIfOnlyOneJavadoc() {
-        if (!isAdvancedProjectSpecific) {
-            return IvyPlugin.getPreferenceStoreHelper().getContainerMappingSetup()
-                    .isMapIfOnlyOneJavadoc();
+    public MappingSetup getInheritedMappingSetup() {
+        if (!mappingProjectSpecific) {
+            return IvyPlugin.getPreferenceStoreHelper().getMappingSetup();
         }
-        return containerMappingSetup.isMapIfOnlyOneJavadoc();
+        return mappingSetup;
     }
 
-    public boolean isInheritedUseExtendedResolveId() {
-        if (!isAdvancedProjectSpecific) {
-            return IvyPlugin.getPreferenceStoreHelper().isUseExtendedResolveId();
+    public AdvancedSetup getInheritedAdvancedSetup() {
+        if (!advancedProjectSpecific) {
+            return IvyPlugin.getPreferenceStoreHelper().getAdvancedSetup();
         }
-        return useExtendedResolveId;
+        return advancedSetup;
     }
 
     public String toString() {

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerMapper.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerMapper.java?rev=1195176&r1=1195175&r2=1195176&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerMapper.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerMapper.java Sun Oct 30 15:25:43 2011
@@ -41,6 +41,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jdt.core.IClasspathAttribute;
 import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
 
 /**
@@ -58,7 +59,7 @@ public class IvyClasspathContainerMapper
 
     private final Ivy ivy;
 
-    private final IvyClasspathContainerConfiguration conf;
+    private final IJavaProject javaProject;
 
     private final Collection/* <ArtifactDownloadReport> */all;
 
@@ -68,11 +69,17 @@ public class IvyClasspathContainerMapper
                       * <ArtifactDownloadReport , Set<String>>
                       */retrievedArtifacts;
 
+    private ClasspathSetup classpathSetup;
+
+    private MappingSetup mapping;
+
     public IvyClasspathContainerMapper(IProgressMonitor monitor, Ivy ivy,
             IvyClasspathContainerConfiguration conf, ResolveResult resolveResult) {
         this.monitor = monitor;
         this.ivy = ivy;
-        this.conf = conf;
+        this.javaProject = conf.getJavaProject();
+        this.classpathSetup = conf.getInheritedClasspathSetup();
+        this.mapping = conf.getInheritedMappingSetup();
         this.all = resolveResult.getArtifactReports();
         this.artifactsByDependency = resolveResult.getArtifactsByDependency();
         this.retrievedArtifacts = resolveResult.getRetrievedArtifacts();
@@ -88,16 +95,16 @@ public class IvyClasspathContainerMapper
             if (artifact.getType().equals(WorkspaceResolver.ECLIPSE_PROJECT_TYPE)) {
                 // This is a java project in the workspace, add project path
                 // but only add it if it is not a self dependency
-                if (conf.getJavaProject() == null
-                        || !artifact.getName().equals(conf.getJavaProject().getPath().toString())) {
+                if (javaProject == null
+                        || !artifact.getName().equals(javaProject.getPath().toString())) {
                     paths.add(JavaCore.newProjectEntry(new Path(artifact.getName()), true));
                 }
             } else if (artifact.getLocalFile() != null && accept(artifact.getArtifact())) {
                 Path classpathArtifact = getArtifactPath(artifact);
                 Path sourcesArtifact = getArtifactPath(artifact, sourceArtifactMatcher,
-                    conf.isInheritedMapIfOnlyOneSource());
+                    mapping.isMapIfOnlyOneSource());
                 Path javadocArtifact = getArtifactPath(artifact, javadocArtifactMatcher,
-                    conf.isInheritedMapIfOnlyOneJavadoc());
+                    mapping.isMapIfOnlyOneJavadoc());
                 paths.add(JavaCore.newLibraryEntry(classpathArtifact,
                     getSourceAttachment(classpathArtifact, sourcesArtifact),
                     getSourceAttachmentRoot(classpathArtifact, sourcesArtifact), null,
@@ -184,11 +191,11 @@ public class IvyClasspathContainerMapper
 
     private ArtifactMatcher sourceArtifactMatcher = new ArtifactMatcher() {
         public boolean matchName(Artifact artifact, String source) {
-            return isArtifactName(artifact, source, conf.getInheritedSourceSuffixes(), "source");
+            return isArtifactName(artifact, source, mapping.getSourceSuffixes(), "source");
         }
 
         public boolean match(Artifact a) {
-            return conf.getInheritedSourceTypes().contains(a.getType());
+            return mapping.getSourceTypes().contains(a.getType());
         }
 
         public String getName() {
@@ -198,11 +205,11 @@ public class IvyClasspathContainerMapper
 
     private ArtifactMatcher javadocArtifactMatcher = new ArtifactMatcher() {
         public boolean matchName(Artifact artifact, String javadoc) {
-            return isArtifactName(artifact, javadoc, conf.getInheritedJavadocSuffixes(), "javadoc");
+            return isArtifactName(artifact, javadoc, mapping.getJavadocSuffixes(), "javadoc");
         }
 
         public boolean match(Artifact a) {
-            return conf.getInheritedJavadocTypes().contains(a.getType());
+            return mapping.getJavadocTypes().contains(a.getType());
         }
 
         public String getName() {
@@ -288,9 +295,9 @@ public class IvyClasspathContainerMapper
      * @return <code>true</code> if the artifact can be added
      */
     public boolean accept(Artifact artifact) {
-        return conf.getInheritedAcceptedTypes().contains(artifact.getType())
-                && !conf.getInheritedSourceTypes().contains(artifact.getType())
-                && !conf.getInheritedJavadocTypes().contains(artifact.getType());
+        return classpathSetup.getAcceptedTypes().contains(artifact.getType())
+                && !mapping.getSourceTypes().contains(artifact.getType())
+                && !mapping.getJavadocTypes().contains(artifact.getType());
     }
 
 }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerState.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerState.java?rev=1195176&r1=1195175&r2=1195176&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerState.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerState.java Sun Oct 30 15:25:43 2011
@@ -41,7 +41,7 @@ public class IvyClasspathContainerState 
     }
 
     protected String getIvySettingsPath() throws IvyDEException {
-        return conf.getInheritedIvySettingsPath();
+        return conf.getInheritedSettingsSetup().getResolvedIvySettingsPath(getProject());
     }
 
     protected String getIvyXmlPath() {
@@ -49,19 +49,19 @@ public class IvyClasspathContainerState 
     }
 
     protected IProject getProject() {
-        return conf.getJavaProject() == null ? null : conf.getJavaProject().getProject();
+        return conf.getProject();
     }
 
     protected Collection getPropertyFiles() throws IvyDEException {
-        return conf.getInheritedPropertyFiles();
+        return conf.getInheritedSettingsSetup().getResolvedPropertyFiles();
     }
 
     protected boolean isLoadSettingsOnDemandPath() {
-        return conf.getInheritedLoadSettingsOnDemandPath();
+        return conf.getInheritedSettingsSetup().isLoadSettingsOnDemand();
     }
 
     protected boolean isResolveInWorkspace() {
-        return conf.isInheritedResolveInWorkspace();
+        return conf.getInheritedClasspathSetup().isResolveInWorkspace();
     }
 
     public String toString() {

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=1195176&r1=1195175&r2=1195176&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 Sun Oct 30 15:25:43 2011
@@ -92,8 +92,8 @@ public final class IvyClasspathUtil {
     public static IvyClasspathContainer jdt2IvyCPC(ClassPathContainer cpc) {
         IClasspathEntry entry = cpc.getClasspathEntry();
         try {
-            IClasspathContainer icp = JavaCore.getClasspathContainer(entry.getPath(), cpc
-                    .getJavaProject());
+            IClasspathContainer icp = JavaCore.getClasspathContainer(entry.getPath(),
+                cpc.getJavaProject());
             if (icp instanceof IvyClasspathContainer) {
                 return (IvyClasspathContainer) icp;
             }
@@ -158,8 +158,8 @@ public final class IvyClasspathUtil {
                         IClasspathContainer cp = JavaCore.getClasspathContainer(path, javaProject);
                         if (cp instanceof IvyClasspathContainer) {
                             IvyClasspathContainer ivycp = (IvyClasspathContainer) cp;
-                            if (ivycp.getConf().getIvyXmlPath().equals(
-                                ivyfile.getProjectRelativePath().toString())) {
+                            if (ivycp.getConf().getIvyXmlPath()
+                                    .equals(ivyfile.getProjectRelativePath().toString())) {
                                 containers.add(ivycp);
                             }
                         }
@@ -192,13 +192,14 @@ public final class IvyClasspathUtil {
                             IvyClasspathContainer ivycp = (IvyClasspathContainer) cp;
                             String settingsPath;
                             try {
-                                settingsPath = ivycp.getConf().getInheritedIvySettingsPath();
+                                settingsPath = ivycp.getConf().getInheritedSettingsSetup()
+                                        .getResolvedIvySettingsPath(ivycp.getConf().getProject());
                             } catch (IvyDEException e) {
                                 // cannot resolve the ivy settings so just ignore
                                 continue;
                             }
-                            if (settingsPath.equals(
-                                ivySettings.getProjectRelativePath().toString())) {
+                            if (settingsPath
+                                    .equals(ivySettings.getProjectRelativePath().toString())) {
                                 containers.add(ivycp);
                             }
                         }
@@ -281,8 +282,7 @@ public final class IvyClasspathUtil {
      *            the project to search into
      * @return the Ivy classpath container if found, otherwise return <code>null</code>
      */
-    public static IClasspathEntry getIvyClasspathEntry(IPath containerPath,
-            IJavaProject javaProject) {
+    public static IClasspathEntry getIvyClasspathEntry(IPath containerPath, IJavaProject javaProject) {
         if (javaProject == null || !javaProject.exists()) {
             return null;
         }
@@ -333,9 +333,12 @@ public final class IvyClasspathUtil {
     /**
      * 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.
+     * @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));

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=1195176&r1=1195175&r2=1195176&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 Sun Oct 30 15:25:43 2011
@@ -26,15 +26,14 @@ import org.apache.ivy.core.module.descri
 import org.apache.ivyde.eclipse.IvyDEException;
 import org.apache.ivyde.eclipse.IvyMarkerManager;
 import org.apache.ivyde.eclipse.IvyPlugin;
-import org.apache.ivyde.eclipse.ui.AcceptedSuffixesTypesComposite;
-import org.apache.ivyde.eclipse.ui.ClasspathTypeComposite;
+import org.apache.ivyde.eclipse.ui.AdvancedSetupTab;
+import org.apache.ivyde.eclipse.ui.ClasspathSetupTab;
 import org.apache.ivyde.eclipse.ui.ConfTableViewer;
 import org.apache.ivyde.eclipse.ui.ConfTableViewer.ConfTableListener;
 import org.apache.ivyde.eclipse.ui.IvyFilePathText;
 import org.apache.ivyde.eclipse.ui.IvyFilePathText.IvyXmlPathListener;
-import org.apache.ivyde.eclipse.ui.IvySettingsTab;
-import org.apache.ivyde.eclipse.ui.preferences.ClasspathPreferencePage;
-import org.apache.ivyde.eclipse.ui.preferences.IvyDEPreferenceStoreHelper;
+import org.apache.ivyde.eclipse.ui.MappingSetupTab;
+import org.apache.ivyde.eclipse.ui.SettingsSetupTab;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IPath;
@@ -49,21 +48,17 @@ import org.eclipse.jdt.core.JavaModelExc
 import org.eclipse.jdt.ui.wizards.IClasspathContainerPage;
 import org.eclipse.jdt.ui.wizards.IClasspathContainerPageExtension;
 import org.eclipse.jdt.ui.wizards.NewElementWizardPage;
-import org.eclipse.jface.preference.PreferenceDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.TabFolder;
 import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.ui.dialogs.PreferencesUtil;
 
 /**
  * Editor of the classpath container configuration at the project level.
@@ -77,26 +72,12 @@ public class IvydeContainerPage extends 
 
     private ConfTableViewer confTableViewer;
 
-    private Combo alphaOrderCheck;
-
-    private Button resolveInWorkspaceCheck;
-
-    private Button resolveBeforeLaunchCheck;
-
-    private Button useExtendedResolveIdCheck;
-
-    private Button advancedProjectSpecificButton;
-
-    private Link advancedGeneralSettingsLink;
-
     private IvyClasspathContainerConfiguration conf;
 
     private IClasspathEntry entry;
 
     private TabFolder tabs;
 
-    private AcceptedSuffixesTypesComposite acceptedSuffixesTypesComposite;
-
     private boolean exported = false;
 
     private String oldIvyFile = null;
@@ -105,11 +86,13 @@ public class IvydeContainerPage extends 
 
     private IvyClasspathContainerState state;
 
-    private IvySettingsTab settingsTab;
+    private SettingsSetupTab settingsSetupTab;
+
+    private ClasspathSetupTab classpathSetupTab;
 
-    private ClasspathTypeComposite classpathTypeComposite;
+    private MappingSetupTab mappingSetupTab;
 
-    private Label alphaOrderLabel;
+    private AdvancedSetupTab advancedSetupTab;
 
     /**
      * Constructor
@@ -203,24 +186,30 @@ public class IvydeContainerPage extends 
         }
         conf.setConfs(confs);
 
-        if (settingsTab.isProjectSpecific()) {
+        if (settingsSetupTab.isProjectSpecific()) {
             conf.setSettingsProjectSpecific(true);
-            conf.setIvySettingsSetup(settingsTab.getSettingsEditor().getIvySettingsSetup());
+            conf.setIvySettingsSetup(settingsSetupTab.getSettingsEditor().getIvySettingsSetup());
         } else {
             conf.setSettingsProjectSpecific(false);
         }
 
-        if (advancedProjectSpecificButton.getSelection()) {
+        if (classpathSetupTab.isProjectSpecific()) {
+            conf.setClassthProjectSpecific(true);
+            conf.setClasspathSetup(classpathSetupTab.getClasspathSetupEditor().getClasspathSetup());
+        } else {
+            conf.setClassthProjectSpecific(false);
+        }
+
+        if (mappingSetupTab.isProjectSpecific()) {
+            conf.setMappingProjectSpecific(true);
+            conf.setMappingSetup(mappingSetupTab.getMappingSetupEditor().getMappingSetup());
+        } else {
+            conf.setMappingProjectSpecific(false);
+        }
+
+        if (advancedSetupTab.isProjectSpecific()) {
             conf.setAdvancedProjectSpecific(true);
-            conf.setContainerMappingSetup(acceptedSuffixesTypesComposite.getContainerMappingSetup());
-            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());
-            }
+            conf.setAdvancedSetup(advancedSetupTab.getAdvancedSetupEditor().getAdvancedSetup());
         } else {
             conf.setAdvancedProjectSpecific(false);
         }
@@ -278,7 +267,7 @@ public class IvydeContainerPage extends 
             IResource settings = project.getProject().findMember(new Path("ivysettings.xml"));
             if (settings != null) {
                 conf.setSettingsProjectSpecific(true);
-                IvySettingsSetup setup = new IvySettingsSetup();
+                SettingsSetup setup = new SettingsSetup();
                 setup.setIvySettingsPath("${workspace_loc:" + project.getElementName()
                         + "/ivysettings.xml}");
                 conf.setIvySettingsSetup(setup);
@@ -298,7 +287,7 @@ public class IvydeContainerPage extends 
         mainTab.setText("Main");
         mainTab.setControl(createMainTab(tabs));
 
-        settingsTab = new IvySettingsTab(tabs) {
+        settingsSetupTab = new SettingsSetupTab(tabs) {
             protected void settingsUpdated() {
                 try {
                     conf.setSettingsProjectSpecific(isProjectSpecific());
@@ -313,14 +302,16 @@ public class IvydeContainerPage extends 
             }
         };
 
-        TabItem advancedTab = new TabItem(tabs, SWT.NONE);
-        advancedTab.setText("Advanced");
-        advancedTab.setControl(createAdvancedTab(tabs));
+        classpathSetupTab = new ClasspathSetupTab(tabs);
+
+        mappingSetupTab = new MappingSetupTab(tabs);
+
+        advancedSetupTab = new AdvancedSetupTab(tabs);
 
         tabs.addSelectionListener(new SelectionAdapter() {
             public void widgetSelected(SelectionEvent e) {
                 ivyFilePathText.updateErrorMarker();
-                settingsTab.getSettingsEditor().updateErrorMarker();
+                settingsSetupTab.getSettingsEditor().updateErrorMarker();
             }
         });
 
@@ -389,134 +380,20 @@ public class IvydeContainerPage extends 
         return composite;
     }
 
-    private Control createAdvancedTab(Composite parent) {
-        Composite composite = new Composite(parent, SWT.NONE);
-        composite.setLayout(new GridLayout());
-        composite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
-
-        Composite headerComposite = new Composite(composite, SWT.NONE);
-        headerComposite.setLayout(new GridLayout(2, false));
-        headerComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
-
-        advancedProjectSpecificButton = new Button(headerComposite, SWT.CHECK);
-        advancedProjectSpecificButton.setText("Enable project specific settings");
-        advancedProjectSpecificButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                updateFieldsStatusAdvanced();
-            }
-        });
-
-        advancedGeneralSettingsLink = new Link(headerComposite, SWT.NONE);
-        advancedGeneralSettingsLink.setFont(composite.getFont());
-        advancedGeneralSettingsLink.setText("<A>Configure Workspace Settings...</A>");
-        advancedGeneralSettingsLink.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn(getShell(),
-                    ClasspathPreferencePage.PEREFERENCE_PAGE_ID, null, null);
-                dialog.open();
-            }
-        });
-        advancedGeneralSettingsLink.setLayoutData(new GridData(SWT.END, SWT.CENTER, false, false));
-
-        Label horizontalLine = new Label(headerComposite, SWT.SEPARATOR | SWT.HORIZONTAL);
-        horizontalLine.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false, 2, 1));
-
-        Composite configComposite = new Composite(composite, SWT.NONE);
-        configComposite.setLayout(new GridLayout(3, false));
-        configComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
-
-        resolveInWorkspaceCheck = new Button(configComposite, SWT.CHECK);
-        resolveInWorkspaceCheck.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true,
-                false, 3, 1));
-        resolveInWorkspaceCheck.setText("Resolve dependencies in workspace");
-        resolveInWorkspaceCheck
-                .setToolTipText("Will replace jars on the classpath with workspace projects");
-
-        resolveBeforeLaunchCheck = new Button(configComposite, SWT.CHECK);
-        resolveBeforeLaunchCheck.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true,
-                false, 3, 1));
-        resolveBeforeLaunchCheck.setText("Resolve before launch");
-        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");
-
-        alphaOrderLabel = new Label(configComposite, SWT.NONE);
-        alphaOrderLabel.setText("Order of the classpath entries:");
-
-        alphaOrderCheck = new Combo(configComposite, SWT.READ_ONLY);
-        alphaOrderCheck
-                .setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false, 2, 1));
-        alphaOrderCheck.setToolTipText("Order of the artifacts in the classpath container");
-        alphaOrderCheck.add("From the ivy.xml");
-        alphaOrderCheck.add("Lexical");
-
-        acceptedSuffixesTypesComposite = new AcceptedSuffixesTypesComposite(configComposite,
-                SWT.NONE);
-        acceptedSuffixesTypesComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
-                true, false, 3, 1));
-
-        classpathTypeComposite = new ClasspathTypeComposite(composite, SWT.NONE);
-        classpathTypeComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true,
-                false, 3, 1));
-
-        return composite;
-    }
-
     private void loadFromConf() {
         ivyFilePathText.init(conf.getIvyXmlPath());
         confTableViewer.init(conf.getConfs());
 
-        IvyDEPreferenceStoreHelper helper = IvyPlugin.getPreferenceStoreHelper();
-
-        settingsTab.init(conf.isSettingsProjectSpecific(), conf.getIvySettingsSetup());
-
-        if (conf.isAdvancedProjectSpecific()) {
-            advancedProjectSpecificButton.setSelection(true);
-            acceptedSuffixesTypesComposite.init(conf.getContainerMappingSetup());
-            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 {
-            advancedProjectSpecificButton.setSelection(false);
-            acceptedSuffixesTypesComposite.init(helper.getContainerMappingSetup());
-            alphaOrderCheck.select(helper.isAlphOrder() ? 1 : 0);
-            resolveInWorkspaceCheck.setSelection(helper.isResolveInWorkspace());
-            resolveBeforeLaunchCheck.setSelection(helper.isResolveBeforeLaunch());
-            useExtendedResolveIdCheck.setSelection(helper.isUseExtendedResolveId());
-            classpathTypeComposite.init(helper.isRetrievedClasspath(),
-                helper.getRetrievedClasspathSetup());
-        }
-
-        if (project == null) {
-            // container in a launch config: always resolve before launch
-            resolveBeforeLaunchCheck.setEnabled(false);
-            resolveBeforeLaunchCheck.setSelection(true);
-        }
-
-        settingsTab.updateFieldsStatusSettings();
-        updateFieldsStatusAdvanced();
-    }
-
-    void updateFieldsStatusAdvanced() {
-        boolean projectSpecific = advancedProjectSpecificButton.getSelection();
-        conf.setAdvancedProjectSpecific(projectSpecific);
-        advancedGeneralSettingsLink.setEnabled(!projectSpecific);
-        acceptedSuffixesTypesComposite.setEnabled(projectSpecific);
-        alphaOrderLabel.setEnabled(projectSpecific);
-        alphaOrderCheck.setEnabled(projectSpecific);
-        resolveInWorkspaceCheck.setEnabled(projectSpecific);
-        useExtendedResolveIdCheck.setEnabled(projectSpecific);
-        resolveBeforeLaunchCheck.setEnabled(projectSpecific && project != null);
-        classpathTypeComposite.setEnabled(projectSpecific);
+        settingsSetupTab.init(conf.isSettingsProjectSpecific(), conf.getIvySettingsSetup());
+        classpathSetupTab.init(conf.isClassthProjectSpecific(), conf.getClasspathSetup());
+        mappingSetupTab.init(conf.isMappingProjectSpecific(), conf.getMappingSetup());
+        // project == null <==> container in a launch config: always resolve before launch
+        advancedSetupTab.init(conf.isAdvancedProjectSpecific(), conf.getAdvancedSetup(), project == null);
+
+        settingsSetupTab.projectSpecificChanged();
+        classpathSetupTab.projectSpecificChanged();
+        mappingSetupTab.projectSpecificChanged();
+        advancedSetupTab.projectSpecificChanged();
     }
 
     public void initialize(IJavaProject p, IClasspathEntry[] currentEntries) {

Copied: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/MappingSetup.java (from r1183639, ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/ContainerMappingSetup.java)
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/MappingSetup.java?p2=ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/MappingSetup.java&p1=ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/ContainerMappingSetup.java&r1=1183639&r2=1195176&rev=1195176&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/ContainerMappingSetup.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/MappingSetup.java Sun Oct 30 15:25:43 2011
@@ -19,9 +19,7 @@ package org.apache.ivyde.eclipse.cpconta
 
 import java.util.List;
 
-public class ContainerMappingSetup {
-
-    private List/* <String> */acceptedTypes;
+public class MappingSetup {
 
     private List/* <String> */sourceTypes;
 
@@ -38,12 +36,11 @@ public class ContainerMappingSetup {
     /**
      * Default constructor
      */
-    public ContainerMappingSetup() {
+    public MappingSetup() {
         // default constructor
     }
 
-    public void set(ContainerMappingSetup setup) {
-        this.acceptedTypes = setup.acceptedTypes;
+    public void set(MappingSetup setup) {
         this.sourceTypes = setup.sourceTypes;
         this.javadocTypes = setup.javadocTypes;
         this.sourceSuffixes = setup.sourceSuffixes;
@@ -52,14 +49,6 @@ public class ContainerMappingSetup {
         this.mapIfOnlyOneJavadoc = setup.mapIfOnlyOneJavadoc;
     }
 
-    public List getAcceptedTypes() {
-        return acceptedTypes;
-    }
-
-    public void setAcceptedTypes(List acceptedTypes) {
-        this.acceptedTypes = acceptedTypes;
-    }
-
     public List getSourceTypes() {
         return sourceTypes;
     }

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/MappingSetup.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/MappingSetup.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/MappingSetup.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/SettingsSetup.java (from r1183639, ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvySettingsSetup.java)
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/SettingsSetup.java?p2=ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/SettingsSetup.java&p1=ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvySettingsSetup.java&r1=1183639&r2=1195176&rev=1195176&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvySettingsSetup.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/SettingsSetup.java Sun Oct 30 15:25:43 2011
@@ -35,7 +35,7 @@ import org.eclipse.core.variables.Variab
  * This class is just a simple bean defining the properties which configure an IvyDE classpath
  * container.
  */
-public class IvySettingsSetup {
+public class SettingsSetup {
 
     private String ivySettingsPath;
 
@@ -46,11 +46,11 @@ public class IvySettingsSetup {
     /**
      * Default constructor
      */
-    public IvySettingsSetup() {
+    public SettingsSetup() {
         // default constructor
     }
 
-    public void set(IvySettingsSetup setup) {
+    public void set(SettingsSetup setup) {
         this.ivySettingsPath = setup.ivySettingsPath;
         this.propertyFiles = setup.propertyFiles;
         this.loadSettingsOnDemand = setup.loadSettingsOnDemand;

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/SettingsSetup.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/SettingsSetup.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/SettingsSetup.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/StandaloneRetrieveSerializer.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/StandaloneRetrieveSerializer.java?rev=1195176&r1=1195175&r2=1195176&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/StandaloneRetrieveSerializer.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/StandaloneRetrieveSerializer.java Sun Oct 30 15:25:43 2011
@@ -34,7 +34,7 @@ import javax.xml.transform.TransformerFa
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.ivyde.eclipse.cpcontainer.IvySettingsSetup;
+import org.apache.ivyde.eclipse.cpcontainer.SettingsSetup;
 import org.eclipse.core.resources.IProject;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
@@ -100,7 +100,7 @@ public class StandaloneRetrieveSerialize
 
                 Node settingsNode = document.createElement(IVYSETTINGS);
                 node.appendChild(settingsNode);
-                writeIvySettingsSetup(document, settingsNode, setup.getIvySettingsSetup());
+                writeSettingsSetup(document, settingsNode, setup.getSettingsSetup());
 
                 Node ivyxmlNode = document.createElement(IVYXML);
                 node.appendChild(ivyxmlNode);
@@ -130,19 +130,19 @@ public class StandaloneRetrieveSerialize
         }
     }
 
-    private void writeIvySettingsSetup(Document document, Node settingsNode,
-            IvySettingsSetup ivySettingsSetup) {
+    private void writeSettingsSetup(Document document, Node settingsNode,
+            SettingsSetup settingsSetup) {
         NamedNodeMap attributes = settingsNode.getAttributes();
 
         Attr attr = document.createAttribute(IVYSETTING_PATH);
-        attr.setValue(ivySettingsSetup.getRawIvySettingsPath());
+        attr.setValue(settingsSetup.getRawIvySettingsPath());
         attributes.setNamedItem(attr);
 
         attr = document.createAttribute(IVYSETTING_LOADONDEMAND);
-        attr.setValue(Boolean.toString(ivySettingsSetup.isLoadSettingsOnDemand()));
+        attr.setValue(Boolean.toString(settingsSetup.isLoadSettingsOnDemand()));
         attributes.setNamedItem(attr);
 
-        Iterator it = ivySettingsSetup.getRawPropertyFiles().iterator();
+        Iterator it = settingsSetup.getRawPropertyFiles().iterator();
         while (it.hasNext()) {
             String file = (String) it.next();
             Node pathNode = document.createElement(PROPERTYFILE);
@@ -209,8 +209,8 @@ public class StandaloneRetrieveSerialize
                 for (int j = 0; j < children.getLength(); j++) {
                     Node item = children.item(j);
                     if (item.getNodeName().equals(IVYSETTINGS)) {
-                        IvySettingsSetup ivySettingsSetup = readIvySettingsSetup(item);
-                        setup.setIvySettingsSetup(ivySettingsSetup);
+                        SettingsSetup settingsSetup = readSettingsSetup(item);
+                        setup.setSettingsSetup(settingsSetup);
                         setup.setSettingsProjectSpecific(true);
                     } else if (item.getNodeName().equals(IVYXML)) {
                         String ivyXmlPath = readIvyXmlPath(item);
@@ -249,16 +249,16 @@ public class StandaloneRetrieveSerialize
         return node.getNodeValue();
     }
 
-    private IvySettingsSetup readIvySettingsSetup(Node node) throws SAXException {
+    private SettingsSetup readSettingsSetup(Node node) throws SAXException {
         NamedNodeMap attributes = node.getAttributes();
 
-        IvySettingsSetup ivySettingsSetup = new IvySettingsSetup();
+        SettingsSetup settingsSetup = new SettingsSetup();
 
         String path = getAttribute(attributes, IVYSETTING_PATH);
-        ivySettingsSetup.setIvySettingsPath(path);
+        settingsSetup.setIvySettingsPath(path);
 
         String loadOnDemand = getAttribute(attributes, IVYSETTING_LOADONDEMAND);
-        ivySettingsSetup.setLoadSettingsOnDemand(Boolean.valueOf(loadOnDemand).booleanValue());
+        settingsSetup.setLoadSettingsOnDemand(Boolean.valueOf(loadOnDemand).booleanValue());
 
         List/* <String> */propertyFiles = new ArrayList();
 
@@ -273,9 +273,9 @@ public class StandaloneRetrieveSerialize
             }
         }
 
-        ivySettingsSetup.setPropertyFiles(propertyFiles);
+        settingsSetup.setPropertyFiles(propertyFiles);
 
-        return ivySettingsSetup;
+        return settingsSetup;
     }
 
     private String readIvyXmlPath(Node node) throws SAXException {

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/StandaloneRetrieveSetup.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/StandaloneRetrieveSetup.java?rev=1195176&r1=1195175&r2=1195176&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/StandaloneRetrieveSetup.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/StandaloneRetrieveSetup.java Sun Oct 30 15:25:43 2011
@@ -17,24 +17,21 @@
  */
 package org.apache.ivyde.eclipse.retrieve;
 
-import java.util.Collection;
-
-import org.apache.ivyde.eclipse.IvyDEException;
 import org.apache.ivyde.eclipse.IvyPlugin;
-import org.apache.ivyde.eclipse.cpcontainer.IvySettingsSetup;
+import org.apache.ivyde.eclipse.cpcontainer.SettingsSetup;
 import org.eclipse.core.resources.IProject;
 
 public class StandaloneRetrieveSetup {
 
     private String name = "dependencies";
 
-    private IvySettingsSetup ivySettingsSetup = new IvySettingsSetup();
+    private SettingsSetup settingsSetup = new SettingsSetup();
 
     private String ivyXmlPath = "ivy.xml";
 
     private RetrieveSetup retrieveSetup = new RetrieveSetup();
 
-    private boolean isSettingsProjectSpecific;
+    private boolean settingsProjectSpecific;
 
     private IProject project;
 
@@ -52,12 +49,12 @@ public class StandaloneRetrieveSetup {
         this.name = name;
     }
 
-    public IvySettingsSetup getIvySettingsSetup() {
-        return ivySettingsSetup;
+    public SettingsSetup getSettingsSetup() {
+        return settingsSetup;
     }
 
-    public void setIvySettingsSetup(IvySettingsSetup ivySettingsSetup) {
-        this.ivySettingsSetup = ivySettingsSetup;
+    public void setSettingsSetup(SettingsSetup settingsSetup) {
+        this.settingsSetup = settingsSetup;
     }
 
     public String getIvyXmlPath() {
@@ -77,11 +74,11 @@ public class StandaloneRetrieveSetup {
     }
 
     public boolean isSettingProjectSpecific() {
-        return isSettingsProjectSpecific;
+        return settingsProjectSpecific;
     }
 
     public void setSettingsProjectSpecific(boolean isSettingsProjectSpecific) {
-        this.isSettingsProjectSpecific = isSettingsProjectSpecific;
+        this.settingsProjectSpecific = isSettingsProjectSpecific;
     }
 
     public IProject getProject() {
@@ -96,28 +93,12 @@ public class StandaloneRetrieveSetup {
         return name != null ? name : retrieveSetup.getRetrievePattern();
     }
 
-    public String getInheritedIvySettingsPath() throws IvyDEException {
-        if (!isSettingsProjectSpecific) {
-            return IvyPlugin.getPreferenceStoreHelper().getIvySettingsSetup()
-                    .getResolvedIvySettingsPath(project);
-        }
-        return ivySettingsSetup.getResolvedIvySettingsPath(project);
-    }
-
-    public Collection getInheritedPropertyFiles() throws IvyDEException {
-        if (!isSettingsProjectSpecific) {
-            return IvyPlugin.getPreferenceStoreHelper().getIvySettingsSetup()
-                    .getResolvedPropertyFiles();
+    public SettingsSetup getInheritedSettingSetup() {
+        if (!settingsProjectSpecific) {
+            return IvyPlugin.getPreferenceStoreHelper().getSettingsSetup();
         }
-        return ivySettingsSetup.getResolvedPropertyFiles();
-    }
+        return settingsSetup;
 
-    public boolean isInheritedLoadSettingsOnDemand() {
-        if (!isSettingsProjectSpecific) {
-            return IvyPlugin.getPreferenceStoreHelper().getIvySettingsSetup()
-                    .isLoadSettingsOnDemand();
-        }
-        return ivySettingsSetup.isLoadSettingsOnDemand();
     }
 
 }



Mime
View raw message