ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1195176 [2/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
Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/StandaloneRetrieveSetupState.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/StandaloneRetrieveSetupState.java?rev=1195176&r1=1195175&r2=1195176&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/StandaloneRetrieveSetupState.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/retrieve/StandaloneRetrieveSetupState.java Sun Oct 30 15:25:43 2011
@@ -32,7 +32,7 @@ public class StandaloneRetrieveSetupStat
     }
 
     protected String getIvySettingsPath() throws IvyDEException {
-        return setup.getInheritedIvySettingsPath();
+        return setup.getInheritedSettingSetup().getResolvedIvySettingsPath(setup.getProject());
     }
 
     protected String getIvyXmlPath() {
@@ -44,11 +44,11 @@ public class StandaloneRetrieveSetupStat
     }
 
     protected Collection getPropertyFiles() throws IvyDEException {
-        return setup.getInheritedPropertyFiles();
+        return setup.getInheritedSettingSetup().getResolvedPropertyFiles();
     }
 
     protected boolean isLoadSettingsOnDemandPath() {
-        return setup.isInheritedLoadSettingsOnDemand();
+        return setup.getInheritedSettingSetup().isLoadSettingsOnDemand();
     }
 
     protected boolean isResolveInWorkspace() {

Added: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AbstractSetupTab.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AbstractSetupTab.java?rev=1195176&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AbstractSetupTab.java (added)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AbstractSetupTab.java Sun Oct 30 15:25:43 2011
@@ -0,0 +1,108 @@
+/*
+ *  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.ui;
+
+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.Composite;
+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;
+
+public abstract class AbstractSetupTab {
+
+    private Button projectSpecificButton;
+
+    private Link mainGeneralSettingsLink;
+
+    private Composite setupEditor;
+
+    public AbstractSetupTab(final TabFolder tabs, String title, final String preferencePageId) {
+        TabItem tab = new TabItem(tabs, SWT.NONE);
+        tab.setText(title);
+
+        Composite composite = new Composite(tabs, 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));
+
+        projectSpecificButton = new Button(headerComposite, SWT.CHECK);
+        projectSpecificButton.setText("Enable project specific settings");
+        projectSpecificButton.addSelectionListener(new SelectionAdapter() {
+            public void widgetSelected(SelectionEvent e) {
+                projectSpecificChanged();
+            }
+        });
+
+        mainGeneralSettingsLink = new Link(headerComposite, SWT.NONE);
+        mainGeneralSettingsLink.setFont(headerComposite.getFont());
+        mainGeneralSettingsLink.setText("<A>Configure Workspace Settings...</A>");
+        mainGeneralSettingsLink.addSelectionListener(new SelectionAdapter() {
+            public void widgetSelected(SelectionEvent e) {
+                PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn(tabs.getShell(),
+                    preferencePageId, null, null);
+                dialog.open();
+            }
+        });
+        mainGeneralSettingsLink.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));
+
+        // CheckStyle:MagicNumber| OFF
+        Composite configComposite = new Composite(composite, SWT.NONE);
+        configComposite.setLayout(new GridLayout());
+        configComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
+
+        setupEditor = createSetupEditor(configComposite);
+
+        tab.setControl(composite);
+    }
+
+    abstract protected Composite createSetupEditor(Composite configComposite);
+
+    public void init(boolean isProjectSpecific) {
+        if (isProjectSpecific) {
+            projectSpecificButton.setSelection(true);
+        } else {
+            projectSpecificButton.setSelection(false);
+            setupEditor.setEnabled(false);
+        }
+    }
+
+    public boolean isProjectSpecific() {
+        return projectSpecificButton.getSelection();
+    }
+
+    public void projectSpecificChanged() {
+        boolean projectSpecific = projectSpecificButton.getSelection();
+        mainGeneralSettingsLink.setEnabled(!projectSpecific);
+        setupEditor.setEnabled(projectSpecific);
+    }
+
+}
\ No newline at end of file

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

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

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

Added: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AdvancedSetupEditor.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AdvancedSetupEditor.java?rev=1195176&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AdvancedSetupEditor.java (added)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AdvancedSetupEditor.java Sun Oct 30 15:25:43 2011
@@ -0,0 +1,75 @@
+/*
+ *  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.ui;
+
+import org.apache.ivyde.eclipse.cpcontainer.AdvancedSetup;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+
+public class AdvancedSetupEditor extends Composite {
+
+    private Button resolveBeforeLaunchCheck;
+
+    private Button useExtendedResolveIdCheck;
+
+    public AdvancedSetupEditor(Composite parent, int style) {
+        super(parent, style);
+        setLayout(new GridLayout());
+
+        resolveBeforeLaunchCheck = new Button(this, SWT.CHECK);
+        resolveBeforeLaunchCheck.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true,
+                false));
+        resolveBeforeLaunchCheck.setText("Resolve before launch");
+        resolveBeforeLaunchCheck
+                .setToolTipText("Trigger a resolve before each run of any kind of java launch configuration");
+
+        useExtendedResolveIdCheck = new Button(this, SWT.CHECK);
+        useExtendedResolveIdCheck.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true,
+                false));
+        useExtendedResolveIdCheck.setText("Use extended resolve id");
+        useExtendedResolveIdCheck
+                .setToolTipText("Will append status, branch and revision info to the default resolve id");
+    }
+
+    public void init(AdvancedSetup setup, boolean forceResolveBeforeLaunch) {
+        resolveBeforeLaunchCheck.setSelection(setup.isResolveBeforeLaunch());
+        useExtendedResolveIdCheck.setSelection(setup.isUseExtendedResolveId());
+
+        if (forceResolveBeforeLaunch) {
+            // container in a launch config: always resolve before launch
+            resolveBeforeLaunchCheck.setEnabled(false);
+            resolveBeforeLaunchCheck.setSelection(true);
+        }
+    }
+
+    public AdvancedSetup getAdvancedSetup() {
+        AdvancedSetup setup = new AdvancedSetup();
+        setup.setResolveBeforeLaunch(resolveBeforeLaunchCheck.getSelection());
+        setup.setUseExtendedResolveId(useExtendedResolveIdCheck.getSelection());
+        return setup;
+    }
+
+    public void setEnabled(boolean enabled) {
+        resolveBeforeLaunchCheck.setEnabled(enabled);
+        useExtendedResolveIdCheck.setEnabled(enabled);
+        super.setEnabled(enabled);
+    }
+}

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

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

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

Added: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AdvancedSetupTab.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AdvancedSetupTab.java?rev=1195176&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AdvancedSetupTab.java (added)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AdvancedSetupTab.java Sun Oct 30 15:25:43 2011
@@ -0,0 +1,55 @@
+/*
+ *  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.ui;
+
+import org.apache.ivyde.eclipse.IvyPlugin;
+import org.apache.ivyde.eclipse.cpcontainer.AdvancedSetup;
+import org.apache.ivyde.eclipse.ui.preferences.AdvancedSetupPreferencePage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.TabFolder;
+
+public class AdvancedSetupTab extends AbstractSetupTab {
+
+    private AdvancedSetupEditor advancedSetupEditor;
+
+    public AdvancedSetupTab(TabFolder tabs) {
+        super(tabs, "Advanced", AdvancedSetupPreferencePage.PEREFERENCE_PAGE_ID);
+    }
+
+    protected Composite createSetupEditor(Composite configComposite) {
+        advancedSetupEditor = new AdvancedSetupEditor(configComposite, SWT.NONE);
+        advancedSetupEditor.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
+        return advancedSetupEditor;
+    }
+
+    public void init(boolean isProjectSpecific, AdvancedSetup setup, boolean forceResolveBeforeLaunch) {
+        init(isProjectSpecific);
+        if (isProjectSpecific) {
+            advancedSetupEditor.init(setup, forceResolveBeforeLaunch);
+        } else {
+            advancedSetupEditor.init(IvyPlugin.getPreferenceStoreHelper().getAdvancedSetup(), forceResolveBeforeLaunch);
+        }
+    }
+
+    public AdvancedSetupEditor getAdvancedSetupEditor() {
+        return advancedSetupEditor;
+    }
+
+}
\ No newline at end of file

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

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

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

Added: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathSetupEditor.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathSetupEditor.java?rev=1195176&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathSetupEditor.java (added)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathSetupEditor.java Sun Oct 30 15:25:43 2011
@@ -0,0 +1,145 @@
+/*
+ *  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.ui;
+
+import org.apache.ivyde.eclipse.cpcontainer.ClasspathSetup;
+import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathUtil;
+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.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class ClasspathSetupEditor extends Composite {
+
+    private static final int INDENT_BUTTONS = 0;
+
+    private static final int INDENT_RETRIEVE = 60;
+
+    public static final String TOOLTIP_ACCEPTED_TYPES = "Comma separated list of artifact types to add to the classpath.\n" + "Example: jar, zip";
+
+    private Button resolveInWorkspaceCheck;
+
+    private Label alphaOrderLabel;
+
+    private Combo alphaOrderCheck;
+
+    private Button selectCache;
+
+    private Button selectRetrieve;
+
+    private RetrieveComposite retrieveComposite;
+
+    private Label acceptedTypesLabel;
+
+    private Text acceptedTypesText;
+
+    public ClasspathSetupEditor(Composite parent, int style) {
+        super(parent, style);
+        setLayout(new GridLayout(2, false));
+
+        resolveInWorkspaceCheck = new Button(this, SWT.CHECK);
+        resolveInWorkspaceCheck.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true,
+                false, 2, 1));
+        resolveInWorkspaceCheck.setText("Resolve dependencies in workspace");
+        resolveInWorkspaceCheck
+                .setToolTipText("Will replace jars on the classpath with workspace projects");
+
+        acceptedTypesLabel = new Label(this, SWT.NONE);
+        acceptedTypesLabel.setText("Accepted types:");
+
+        acceptedTypesText = new Text(this, SWT.SINGLE | SWT.BORDER);
+        acceptedTypesText.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
+        acceptedTypesText.setToolTipText(TOOLTIP_ACCEPTED_TYPES);
+
+        alphaOrderLabel = new Label(this, SWT.NONE);
+        alphaOrderLabel.setText("Order of the classpath entries:");
+
+        alphaOrderCheck = new Combo(this, SWT.READ_ONLY);
+        alphaOrderCheck.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
+        alphaOrderCheck.setToolTipText("Order of the artifacts in the classpath container");
+        alphaOrderCheck.add("From the ivy.xml");
+        alphaOrderCheck.add("Lexical");
+
+        Label label = new Label(this, SWT.NONE);
+        label.setText("Build the classpath with:");
+        label.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false, 2, 1));
+
+        Composite buttons = new Composite(this, SWT.NONE);
+        buttons.setLayout(new GridLayout(1, false));
+        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1);
+        gridData.horizontalIndent = INDENT_BUTTONS;
+        buttons.setLayoutData(gridData);
+
+        selectCache = new Button(buttons, SWT.RADIO);
+        selectCache.setText("Ivy's cache");
+
+        selectRetrieve = new Button(buttons, SWT.RADIO);
+        selectRetrieve.setText("retrieved artifacts");
+
+        retrieveComposite = new RetrieveComposite(this, SWT.NONE, false);
+        gridData = new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1);
+        gridData.horizontalIndent = INDENT_RETRIEVE;
+        retrieveComposite.setLayoutData(gridData);
+
+        selectRetrieve.addSelectionListener(new SelectionAdapter() {
+            public void widgetSelected(SelectionEvent e) {
+                retrieveComposite.setEnabled(selectRetrieve.getSelection());
+            }
+        });
+    }
+
+    public void init(ClasspathSetup setup) {
+        resolveInWorkspaceCheck.setSelection(setup.isResolveInWorkspace());
+        acceptedTypesText.setText(IvyClasspathUtil.concat(setup.getAcceptedTypes()));
+        alphaOrderCheck.select(setup.isAlphaOrder() ? 1 : 0);
+        selectCache.setSelection(!setup.isRetrievedClasspath());
+        selectRetrieve.setSelection(setup.isRetrievedClasspath());
+        retrieveComposite.init(setup.getRetrieveSetup());
+        retrieveComposite.setEnabled(setup.isRetrievedClasspath());
+    }
+
+    public ClasspathSetup getClasspathSetup() {
+        ClasspathSetup setup = new ClasspathSetup();
+        setup.setResolveInWorkspace(resolveInWorkspaceCheck.getSelection());
+        setup.setAcceptedTypes(IvyClasspathUtil.split(acceptedTypesText.getText()));
+        setup.setAlphaOrder(alphaOrderCheck.getSelectionIndex() == 1);
+        setup.setRetrievedClasspath(selectRetrieve.getSelection());
+        if (setup.isRetrievedClasspath()) {
+            setup.setRetrieveSetup(retrieveComposite.getRetrieveSetup());
+        }
+        return setup;
+    }
+
+    public void setEnabled(boolean enabled) {
+        resolveInWorkspaceCheck.setEnabled(enabled);
+        acceptedTypesLabel.setEnabled(enabled);
+        acceptedTypesText.setEnabled(enabled);
+        alphaOrderLabel.setEnabled(enabled);
+        alphaOrderCheck.setEnabled(enabled);
+        selectCache.setEnabled(enabled);
+        selectRetrieve.setEnabled(enabled);
+        retrieveComposite.setEnabled(enabled);
+        super.setEnabled(enabled);
+    }
+}

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

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

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

Added: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathSetupTab.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathSetupTab.java?rev=1195176&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathSetupTab.java (added)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathSetupTab.java Sun Oct 30 15:25:43 2011
@@ -0,0 +1,54 @@
+/*
+ *  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.ui;
+
+import org.apache.ivyde.eclipse.IvyPlugin;
+import org.apache.ivyde.eclipse.cpcontainer.ClasspathSetup;
+import org.apache.ivyde.eclipse.ui.preferences.ClasspathSetupPreferencePage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.TabFolder;
+
+public class ClasspathSetupTab extends AbstractSetupTab {
+
+    private ClasspathSetupEditor classpathSetupEditor;
+
+    public ClasspathSetupTab(TabFolder tabs) {
+        super(tabs, "Classpath", ClasspathSetupPreferencePage.PEREFERENCE_PAGE_ID);
+    }
+
+    protected Composite createSetupEditor(Composite configComposite) {
+        classpathSetupEditor = new ClasspathSetupEditor(configComposite, SWT.NONE);
+        classpathSetupEditor.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
+        return classpathSetupEditor;
+    }
+
+    public void init(boolean isProjectSpecific, ClasspathSetup setup) {
+        init(isProjectSpecific);
+        if (isProjectSpecific) {
+            classpathSetupEditor.init(setup);
+        } else {
+            classpathSetupEditor.init(IvyPlugin.getPreferenceStoreHelper().getClasspathSetup());
+        }
+    }
+
+    public ClasspathSetupEditor getClasspathSetupEditor() {
+        return classpathSetupEditor;
+    }
+}
\ No newline at end of file

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

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

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

Copied: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/MappingSetupEditor.java (from r1183641, ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AcceptedSuffixesTypesComposite.java)
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/MappingSetupEditor.java?p2=ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/MappingSetupEditor.java&p1=ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AcceptedSuffixesTypesComposite.java&r1=1183641&r2=1195176&rev=1195176&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AcceptedSuffixesTypesComposite.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/MappingSetupEditor.java Sun Oct 30 15:25:43 2011
@@ -17,7 +17,7 @@
  */
 package org.apache.ivyde.eclipse.ui;
 
-import org.apache.ivyde.eclipse.cpcontainer.ContainerMappingSetup;
+import org.apache.ivyde.eclipse.cpcontainer.MappingSetup;
 import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathUtil;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -27,10 +27,7 @@ import org.eclipse.swt.widgets.Composite
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public class AcceptedSuffixesTypesComposite extends Composite {
-
-    public static final String TOOLTIP_ACCEPTED_TYPES = "Comma separated list of artifact types"
-            + " to use in IvyDE Managed Dependencies Library.\n" + "Example: jar, zip";
+public class MappingSetupEditor extends Composite {
 
     public static final String TOOLTIP_SOURCE_TYPES = "Comma separated list of artifact types to"
             + " be used as sources.\nExample: source, src";
@@ -39,10 +36,10 @@ public class AcceptedSuffixesTypesCompos
             + " be used as javadoc.\nExample: javadoc.";
 
     public static final String TOOLTIP_SOURCE_SUFFIXES = "Comma separated list of suffixes to match"
-            + " sources to artifacts.\nExample: -source, -src";
+            + " sources to jars in the classpath.\nExample: -source, -src";
 
     public static final String TOOLTIP_JAVADOC_SUFFIXES = "Comma separated list of suffixes to"
-            + " match javadocs to artifacts.\nExample: -javadoc, -doc";
+            + " match javadocs to jars in the classpath.\nExample: -javadoc, -doc";
 
     public static final String TOOLTIP_MAP_IF_ONLY_ONE_SOURCE = "Will map the source artifact"
             + " to all jar artifact in modules with multiple jar artifacts and only one"
@@ -52,8 +49,6 @@ public class AcceptedSuffixesTypesCompos
             + " to all jar artifact in modules with multiple jar artifacts and only one"
             + " javadoc artifact";
 
-    private Text acceptedTypesText;
-
     private Text sourceTypesText;
 
     private Text sourceSuffixesText;
@@ -66,8 +61,6 @@ public class AcceptedSuffixesTypesCompos
 
     private Button mapIfOnlyOneJavadocCheck;
 
-    private Label acceptedTypesLabel;
-
     private Label sourceTypesLabel;
 
     private Label sourceSuffixesLabel;
@@ -76,19 +69,9 @@ public class AcceptedSuffixesTypesCompos
 
     private Label javadocSuffixesLabel;
 
-    public AcceptedSuffixesTypesComposite(Composite parent, int style) {
+    public MappingSetupEditor(Composite parent, int style) {
         super(parent, style);
-        GridLayout layout = new GridLayout(2, false);
-        layout.marginHeight = 0;
-        layout.marginWidth = 0;
-        setLayout(layout);
-
-        acceptedTypesLabel = new Label(this, SWT.NONE);
-        acceptedTypesLabel.setText("Accepted types:");
-
-        acceptedTypesText = new Text(this, SWT.SINGLE | SWT.BORDER);
-        acceptedTypesText.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
-        acceptedTypesText.setToolTipText(TOOLTIP_ACCEPTED_TYPES);
+        setLayout(new GridLayout(2, false));
 
         sourceTypesLabel = new Label(this, SWT.NONE);
         sourceTypesLabel.setText("Sources types:");
@@ -132,8 +115,7 @@ public class AcceptedSuffixesTypesCompos
 
     }
 
-    public void init(ContainerMappingSetup setup) {
-        acceptedTypesText.setText(IvyClasspathUtil.concat(setup.getAcceptedTypes()));
+    public void init(MappingSetup setup) {
         sourceTypesText.setText(IvyClasspathUtil.concat(setup.getSourceTypes()));
         sourceSuffixesText.setText(IvyClasspathUtil.concat(setup.getSourceSuffixes()));
         javadocTypesText.setText(IvyClasspathUtil.concat(setup.getJavadocTypes()));
@@ -144,8 +126,6 @@ public class AcceptedSuffixesTypesCompos
 
     public void setEnabled(boolean enabled) {
         super.setEnabled(enabled);
-        acceptedTypesLabel.setEnabled(enabled);
-        acceptedTypesText.setEnabled(enabled);
         sourceTypesLabel.setEnabled(enabled);
         sourceTypesText.setEnabled(enabled);
         sourceSuffixesLabel.setEnabled(enabled);
@@ -158,9 +138,8 @@ public class AcceptedSuffixesTypesCompos
         mapIfOnlyOneJavadocCheck.setEnabled(enabled);
     }
 
-    public ContainerMappingSetup getContainerMappingSetup() {
-        ContainerMappingSetup setup = new ContainerMappingSetup();
-        setup.setAcceptedTypes(IvyClasspathUtil.split(acceptedTypesText.getText()));
+    public MappingSetup getMappingSetup() {
+        MappingSetup setup = new MappingSetup();
         setup.setSourceTypes(IvyClasspathUtil.split(sourceTypesText.getText()));
         setup.setJavadocTypes(IvyClasspathUtil.split(javadocTypesText.getText()));
         setup.setSourceSuffixes(IvyClasspathUtil.split(sourceSuffixesText.getText()));

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

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

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

Added: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/MappingSetupTab.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/MappingSetupTab.java?rev=1195176&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/MappingSetupTab.java (added)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/MappingSetupTab.java Sun Oct 30 15:25:43 2011
@@ -0,0 +1,55 @@
+/*
+ *  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.ui;
+
+import org.apache.ivyde.eclipse.IvyPlugin;
+import org.apache.ivyde.eclipse.cpcontainer.MappingSetup;
+import org.apache.ivyde.eclipse.ui.preferences.MappingSetupPreferencePage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.TabFolder;
+
+public class MappingSetupTab extends AbstractSetupTab {
+
+    private MappingSetupEditor mappingSetupEditor;
+
+    public MappingSetupTab(TabFolder tabs) {
+        super(tabs, "Source/Javadoc", MappingSetupPreferencePage.PEREFERENCE_PAGE_ID);
+    }
+
+    protected Composite createSetupEditor(Composite configComposite) {
+        mappingSetupEditor = new MappingSetupEditor(configComposite, SWT.NONE);
+        mappingSetupEditor.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
+        return mappingSetupEditor;
+    }
+
+    public void init(boolean isProjectSpecific, MappingSetup setup) {
+        init(isProjectSpecific);
+        if (isProjectSpecific) {
+            mappingSetupEditor.init(setup);
+        } else {
+            mappingSetupEditor.init(IvyPlugin.getPreferenceStoreHelper().getMappingSetup());
+        }
+    }
+
+    public MappingSetupEditor getMappingSetupEditor() {
+        return mappingSetupEditor;
+    }
+
+}
\ No newline at end of file

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

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

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

Copied: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsSetupEditor.java (from r1190201, ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsEditor.java)
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsSetupEditor.java?p2=ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsSetupEditor.java&p1=ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsEditor.java&r1=1190201&r2=1195176&rev=1195176&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsEditor.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsSetupEditor.java Sun Oct 30 15:25:43 2011
@@ -25,7 +25,7 @@ import java.util.List;
 
 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.runtime.IStatus;
 import org.eclipse.jface.fieldassist.DecoratedField;
 import org.eclipse.jface.fieldassist.FieldDecoration;
@@ -42,7 +42,7 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Text;
 
-public class SettingsEditor extends Composite {
+public class SettingsSetupEditor extends Composite {
 
     public static final String TOOLTIP_SETTINGS_PATH = "The url where your ivysettings file can be"
             + " found. \nLeave it empty to reference the default ivy settings. \n"
@@ -67,7 +67,7 @@ public class SettingsEditor extends Comp
 
     private Button defaultButton;
 
-    public SettingsEditor(Composite parent, int style) {
+    public SettingsSetupEditor(Composite parent, int style) {
         super(parent, style);
 
         GridLayout layout = new GridLayout();
@@ -148,8 +148,8 @@ public class SettingsEditor extends Comp
         propFilesEditor.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
     }
 
-    public IvySettingsSetup getIvySettingsSetup() {
-        IvySettingsSetup setup = new IvySettingsSetup();
+    public SettingsSetup getIvySettingsSetup() {
+        SettingsSetup setup = new SettingsSetup();
         setup.setIvySettingsPath(settingsEditor.getText().getText());
         setup.setLoadSettingsOnDemand(loadOnDemandButton.getSelection());
         setup.setPropertyFiles(propFilesEditor.getFiles());
@@ -157,7 +157,7 @@ public class SettingsEditor extends Comp
     }
 
     public interface SettingsEditorListener {
-        void settingsEditorUpdated(IvySettingsSetup setup);
+        void settingsEditorUpdated(SettingsSetup setup);
     }
 
     public void addListener(SettingsEditorListener listener) {
@@ -174,7 +174,7 @@ public class SettingsEditor extends Comp
 
     void settingsPathUpdated() {
         synchronized (listeners) {
-            IvySettingsSetup setup = getIvySettingsSetup();
+            SettingsSetup setup = getIvySettingsSetup();
             Iterator it = listeners.iterator();
             while (it.hasNext()) {
                 ((SettingsEditorListener) it.next()).settingsEditorUpdated(setup);
@@ -222,7 +222,7 @@ public class SettingsEditor extends Comp
         return null;
     }
 
-    public void init(IvySettingsSetup setup) {
+    public void init(SettingsSetup setup) {
         settingsEditor.getText().setText(setup.getRawIvySettingsPath());
         propFilesEditor.init(setup.getRawPropertyFiles());
         loadOnDemandButton.setSelection(setup.isLoadSettingsOnDemand());

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

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

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

Copied: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsSetupTab.java (from r1190201, ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/IvySettingsTab.java)
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsSetupTab.java?p2=ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsSetupTab.java&p1=ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/IvySettingsTab.java&r1=1190201&r2=1195176&rev=1195176&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/IvySettingsTab.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsSetupTab.java Sun Oct 30 15:25:43 2011
@@ -18,113 +18,48 @@
 package org.apache.ivyde.eclipse.ui;
 
 import org.apache.ivyde.eclipse.IvyPlugin;
-import org.apache.ivyde.eclipse.cpcontainer.IvySettingsSetup;
-import org.apache.ivyde.eclipse.ui.SettingsEditor.SettingsEditorListener;
-import org.apache.ivyde.eclipse.ui.preferences.SettingsPreferencePage;
-import org.eclipse.jface.preference.PreferenceDialog;
+import org.apache.ivyde.eclipse.cpcontainer.SettingsSetup;
+import org.apache.ivyde.eclipse.ui.SettingsSetupEditor.SettingsEditorListener;
+import org.apache.ivyde.eclipse.ui.preferences.SettingsSetupPreferencePage;
 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.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;
 
-public class IvySettingsTab {
+public class SettingsSetupTab extends AbstractSetupTab {
 
-    private Button settingsProjectSpecificButton;
+    private SettingsSetupEditor settingsEditor;
 
-    private Link mainGeneralSettingsLink;
-
-    private SettingsEditor settingsEditor;
-
-    public IvySettingsTab(TabFolder tabs) {
-        TabItem settingsTab = new TabItem(tabs, SWT.NONE);
-        settingsTab.setText("Settings");
-        settingsTab.setControl(createSettingsTab(tabs));
+    public SettingsSetupTab(TabFolder tabs) {
+        super(tabs, "Settings", SettingsSetupPreferencePage.PEREFERENCE_PAGE_ID);
     }
 
-    private Control createSettingsTab(final 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));
-
-        settingsProjectSpecificButton = new Button(headerComposite, SWT.CHECK);
-        settingsProjectSpecificButton.setText("Enable project specific settings");
-        settingsProjectSpecificButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                updateFieldsStatusSettings();
-                settingsUpdated();
-            }
-        });
-
-        mainGeneralSettingsLink = new Link(headerComposite, SWT.NONE);
-        mainGeneralSettingsLink.setFont(headerComposite.getFont());
-        mainGeneralSettingsLink.setText("<A>Configure Workspace Settings...</A>");
-        mainGeneralSettingsLink.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn(parent
-                        .getShell(), SettingsPreferencePage.PEREFERENCE_PAGE_ID, null, null);
-                dialog.open();
-            }
-        });
-        mainGeneralSettingsLink.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));
-
-        // CheckStyle:MagicNumber| OFF
-        Composite configComposite = new Composite(composite, SWT.NONE);
-        configComposite.setLayout(new GridLayout(3, false));
-        configComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
-
-        settingsEditor = new SettingsEditor(configComposite, SWT.NONE);
-        settingsEditor.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true, 3, 1));
+    protected Composite createSetupEditor(Composite configComposite) {
+        settingsEditor = new SettingsSetupEditor(configComposite, SWT.NONE);
+        settingsEditor.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
         settingsEditor.addListener(new SettingsEditorListener() {
-            public void settingsEditorUpdated(IvySettingsSetup setup) {
+            public void settingsEditorUpdated(SettingsSetup setup) {
                 settingsUpdated();
             }
         });
 
-        return composite;
+        return settingsEditor;
     }
 
-    public void init(boolean isProjectSpecific, IvySettingsSetup setup) {
+    public void init(boolean isProjectSpecific, SettingsSetup setup) {
+        init(isProjectSpecific);
         if (isProjectSpecific) {
-            settingsProjectSpecificButton.setSelection(true);
             settingsEditor.init(setup);
         } else {
-            settingsProjectSpecificButton.setSelection(false);
-            settingsEditor.init(IvyPlugin.getPreferenceStoreHelper().getIvySettingsSetup());
-            settingsEditor.setEnabled(false);
+            settingsEditor.init(IvyPlugin.getPreferenceStoreHelper().getSettingsSetup());
         }
     }
 
-    public boolean isProjectSpecific() {
-        return settingsProjectSpecificButton.getSelection();
-    }
-
-    public void updateFieldsStatusSettings() {
-        boolean projectSpecific = settingsProjectSpecificButton.getSelection();
-        mainGeneralSettingsLink.setEnabled(!projectSpecific);
-        settingsEditor.setEnabled(projectSpecific);
-    }
-
     protected void settingsUpdated() {
         // nothing to do
     }
 
-    public SettingsEditor getSettingsEditor() {
+    public SettingsSetupEditor getSettingsEditor() {
         return settingsEditor;
     }
 

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

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

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

Added: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/AdvancedSetupPreferencePage.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/AdvancedSetupPreferencePage.java?rev=1195176&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/AdvancedSetupPreferencePage.java (added)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/AdvancedSetupPreferencePage.java Sun Oct 30 15:25:43 2011
@@ -0,0 +1,63 @@
+/*
+ *  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.ui.preferences;
+
+import org.apache.ivyde.eclipse.IvyPlugin;
+import org.apache.ivyde.eclipse.ui.AdvancedSetupEditor;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+public class AdvancedSetupPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
+
+    /** the ID of the preference page */
+    public static final String PEREFERENCE_PAGE_ID = "org.apache.ivyde.eclipse.ui.preferences.AdvancedSetupPreferencePage";
+
+    private AdvancedSetupEditor advancedSetupEditor;
+
+    public AdvancedSetupPreferencePage() {
+        setPreferenceStore(IvyPlugin.getDefault().getPreferenceStore());
+    }
+
+    public void init(IWorkbench workbench) {
+        setPreferenceStore(IvyPlugin.getDefault().getPreferenceStore());
+    }
+
+    protected Control createContents(Composite parent) {
+        advancedSetupEditor = new AdvancedSetupEditor(parent, SWT.NONE);
+        advancedSetupEditor.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
+
+        advancedSetupEditor.init(IvyPlugin.getPreferenceStoreHelper().getAdvancedSetup(), false);
+
+        return advancedSetupEditor;
+    }
+
+    public boolean performOk() {
+        IvyDEPreferenceStoreHelper helper = IvyPlugin.getPreferenceStoreHelper();
+        helper.setAdvancedSetup(advancedSetupEditor.getAdvancedSetup());
+        return true;
+    }
+
+    protected void performDefaults() {
+        advancedSetupEditor.init(PreferenceInitializer.DEFAULT_ADVANCED_SETUP, false);
+    }
+}

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/AdvancedSetupPreferencePage.java
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Copied: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/ClasspathSetupPreferencePage.java (from r1183639, 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/ClasspathSetupPreferencePage.java?p2=ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/ClasspathSetupPreferencePage.java&p1=ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/ClasspathPreferencePage.java&r1=1183639&r2=1195176&rev=1195176&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/ClasspathSetupPreferencePage.java Sun Oct 30 15:25:43 2011
@@ -18,39 +18,24 @@
 package org.apache.ivyde.eclipse.ui.preferences;
 
 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.ClasspathSetupEditor;
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.swt.SWT;
 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.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 
-public class ClasspathPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
+public class ClasspathSetupPreferencePage extends PreferencePage implements
+        IWorkbenchPreferencePage {
 
     /** the ID of the preference page */
-    public static final String PEREFERENCE_PAGE_ID
-        = "org.apache.ivyde.eclipse.ui.preferences.ClasspathPreferencePage";
+    public static final String PEREFERENCE_PAGE_ID = "org.apache.ivyde.eclipse.ui.preferences.ClasspathSetupPreferencePage";
 
-    private Button resolveInWorkspaceCheck;
+    private ClasspathSetupEditor classpathSetupComposite;
 
-    private Button resolveBeforeLaunchCheck;
-    
-    private Button useExtendedResolveIdCheck;
-
-    private Combo alphaOrderCheck;
-
-    private AcceptedSuffixesTypesComposite acceptedSuffixesTypesComposite;
-
-    private ClasspathTypeComposite classpathTypeComposite;
-
-    public ClasspathPreferencePage() {
+    public ClasspathSetupPreferencePage() {
         setPreferenceStore(IvyPlugin.getDefault().getPreferenceStore());
     }
 
@@ -59,87 +44,22 @@ public class ClasspathPreferencePage ext
     }
 
     protected Control createContents(Composite parent) {
-        Composite composite = new Composite(parent, SWT.NONE);
-        // CheckStyle:MagicNumber| OFF
-        composite.setLayout(new GridLayout(3, false));
-        composite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
-
-        resolveInWorkspaceCheck = new Button(composite, 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(composite, 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(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:");
-
-        alphaOrderCheck = new Combo(composite, 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(composite, 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));
+        classpathSetupComposite = new ClasspathSetupEditor(parent, SWT.NONE);
+        classpathSetupComposite
+                .setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
 
-        // CheckStyle:MagicNumber| ON
+        classpathSetupComposite.init(IvyPlugin.getPreferenceStoreHelper().getClasspathSetup());
 
-        initPreferences();
-
-        return composite;
-    }
-
-    private void initPreferences() {
-        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
-                .getRetrievedClasspathSetup());
+        return classpathSetupComposite;
     }
 
     public boolean performOk() {
         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());
-        helper.setRetrievedClasspathSetup(classpathTypeComposite.getRetrieveSetup());
+        helper.setClasspathSetup(classpathSetupComposite.getClasspathSetup());
         return true;
     }
 
     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,
-            PreferenceInitializer.DEFAULT_RETRIEVED_CLASSPATH_SETUP);
+        classpathSetupComposite.init(PreferenceInitializer.DEFAULT_CLASSPATH_SETUP);
     }
 }

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/ClasspathSetupPreferencePage.java
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/EditStandaloneRetrieveDialog.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/EditStandaloneRetrieveDialog.java?rev=1195176&r1=1195175&r2=1195176&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/EditStandaloneRetrieveDialog.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/EditStandaloneRetrieveDialog.java Sun Oct 30 15:25:43 2011
@@ -19,7 +19,7 @@ package org.apache.ivyde.eclipse.ui.pref
 
 import org.apache.ivyde.eclipse.retrieve.StandaloneRetrieveSetup;
 import org.apache.ivyde.eclipse.ui.IvyFilePathText;
-import org.apache.ivyde.eclipse.ui.IvySettingsTab;
+import org.apache.ivyde.eclipse.ui.SettingsSetupTab;
 import org.apache.ivyde.eclipse.ui.RetrieveComposite;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.dialogs.Dialog;
@@ -46,7 +46,7 @@ public class EditStandaloneRetrieveDialo
 
     private RetrieveComposite retrieveComposite;
 
-    private IvySettingsTab settingsTab;
+    private SettingsSetupTab settingsTab;
 
     private StandaloneRetrieveSetup setup;
 
@@ -64,7 +64,7 @@ public class EditStandaloneRetrieveDialo
         mainTab.setText("Main");
         mainTab.setControl(createMainTab(tabs));
 
-        settingsTab = new IvySettingsTab(tabs) {
+        settingsTab = new SettingsSetupTab(tabs) {
             protected void settingsUpdated() {
                 super.settingsUpdated();
             }
@@ -72,7 +72,7 @@ public class EditStandaloneRetrieveDialo
 
         nameText.setText(retrieveSetup.getName());
         settingsTab.init(retrieveSetup.isSettingProjectSpecific(),
-            retrieveSetup.getIvySettingsSetup());
+            retrieveSetup.getSettingsSetup());
         ivyFilePathText.init(retrieveSetup.getIvyXmlPath());
         retrieveComposite.init(retrieveSetup.getRetrieveSetup());
 
@@ -114,7 +114,7 @@ public class EditStandaloneRetrieveDialo
         setup = new StandaloneRetrieveSetup();
         setup.setName(nameText.getText());
         setup.setSettingsProjectSpecific(settingsTab.isProjectSpecific());
-        setup.setIvySettingsSetup(settingsTab.getSettingsEditor().getIvySettingsSetup());
+        setup.setSettingsSetup(settingsTab.getSettingsEditor().getIvySettingsSetup());
         setup.setIvyXmlPath(ivyFilePathText.getIvyFilePath());
         setup.setRetrieveSetup(retrieveComposite.getRetrieveSetup());
         super.okPressed();

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=1195176&r1=1195175&r2=1195176&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 Sun Oct 30 15:25:43 2011
@@ -17,9 +17,11 @@
  */
 package org.apache.ivyde.eclipse.ui.preferences;
 
-import org.apache.ivyde.eclipse.cpcontainer.ContainerMappingSetup;
+import org.apache.ivyde.eclipse.cpcontainer.AdvancedSetup;
+import org.apache.ivyde.eclipse.cpcontainer.ClasspathSetup;
 import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathUtil;
-import org.apache.ivyde.eclipse.cpcontainer.IvySettingsSetup;
+import org.apache.ivyde.eclipse.cpcontainer.MappingSetup;
+import org.apache.ivyde.eclipse.cpcontainer.SettingsSetup;
 import org.apache.ivyde.eclipse.retrieve.RetrieveSetup;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
@@ -49,8 +51,8 @@ public class IvyDEPreferenceStoreHelper 
         prefStore.setValue(PreferenceConstants.ORGANISATION_URL, url);
     }
 
-    public IvySettingsSetup getIvySettingsSetup() {
-        IvySettingsSetup setup = new IvySettingsSetup();
+    public SettingsSetup getSettingsSetup() {
+        SettingsSetup setup = new SettingsSetup();
         setup.setIvySettingsPath(prefStore.getString(PreferenceConstants.IVYSETTINGS_PATH));
         setup.setLoadSettingsOnDemand(prefStore
                 .getBoolean(PreferenceConstants.LOAD_SETTINGS_ON_DEMAND));
@@ -59,18 +61,48 @@ public class IvyDEPreferenceStoreHelper 
         return setup;
     }
 
-    public void setIvySettingsSetup(IvySettingsSetup setup) {
+    public void setSettingsSetup(SettingsSetup setup) {
         prefStore.setValue(PreferenceConstants.IVYSETTINGS_PATH, setup.getRawIvySettingsPath());
-        prefStore.setValue(PreferenceConstants.PROPERTY_FILES, IvyClasspathUtil.concat(setup
-                .getRawPropertyFiles()));
-        prefStore.setValue(PreferenceConstants.LOAD_SETTINGS_ON_DEMAND, setup
-                .isLoadSettingsOnDemand());
+        prefStore.setValue(PreferenceConstants.PROPERTY_FILES,
+            IvyClasspathUtil.concat(setup.getRawPropertyFiles()));
+        prefStore.setValue(PreferenceConstants.LOAD_SETTINGS_ON_DEMAND,
+            setup.isLoadSettingsOnDemand());
     }
 
-    public ContainerMappingSetup getContainerMappingSetup() {
-        ContainerMappingSetup setup = new ContainerMappingSetup();
+    public ClasspathSetup getClasspathSetup() {
+        ClasspathSetup setup = new ClasspathSetup();
+        setup.setResolveInWorkspace(prefStore.getBoolean(PreferenceConstants.RESOLVE_IN_WORKSPACE));
         setup.setAcceptedTypes(IvyClasspathUtil.split(prefStore
                 .getString(PreferenceConstants.ACCEPTED_TYPES)));
+        setup.setAlphaOrder(prefStore.getBoolean(PreferenceConstants.ALPHABETICAL_ORDER));
+        setup.setRetrievedClasspath(prefStore.getBoolean(PreferenceConstants.RETRIEVED_CLASSPATH));
+        RetrieveSetup retrieveSetup = new RetrieveSetup();
+        retrieveSetup.setRetrievePattern(prefStore
+                .getString(PreferenceConstants.RETRIEVED_CLASSPATH_PATTERN));
+        retrieveSetup.setRetrieveSync(prefStore
+                .getBoolean(PreferenceConstants.RETRIEVED_CLASSPATH_SYNC));
+        retrieveSetup.setRetrieveTypes(prefStore
+                .getString(PreferenceConstants.RETRIEVED_CLASSPATH_TYPES));
+        return setup;
+    }
+
+    public void setClasspathSetup(ClasspathSetup setup) {
+        prefStore.setValue(PreferenceConstants.RESOLVE_IN_WORKSPACE, setup.isResolveInWorkspace());
+        prefStore.setValue(PreferenceConstants.ACCEPTED_TYPES,
+            IvyClasspathUtil.concat(setup.getAcceptedTypes()));
+        prefStore.setValue(PreferenceConstants.ALPHABETICAL_ORDER, setup.isAlphaOrder());
+        prefStore.setValue(PreferenceConstants.RETRIEVED_CLASSPATH, setup.isRetrievedClasspath());
+        RetrieveSetup retrieveSetup = setup.getRetrieveSetup();
+        prefStore.setValue(PreferenceConstants.RETRIEVED_CLASSPATH_PATTERN,
+            retrieveSetup.getRetrievePattern());
+        prefStore.setValue(PreferenceConstants.RETRIEVED_CLASSPATH_SYNC,
+            retrieveSetup.isRetrieveSync());
+        prefStore.setValue(PreferenceConstants.RETRIEVED_CLASSPATH_TYPES,
+            retrieveSetup.getRetrieveTypes());
+    }
+
+    public MappingSetup getMappingSetup() {
+        MappingSetup setup = new MappingSetup();
         setup.setSourceTypes(IvyClasspathUtil.split(prefStore
                 .getString(PreferenceConstants.SOURCES_TYPES)));
         setup.setJavadocTypes(IvyClasspathUtil.split(prefStore
@@ -86,53 +118,35 @@ public class IvyDEPreferenceStoreHelper 
         return setup;
     }
 
-    public void setContainerMappingSetup(ContainerMappingSetup setup) {
-        prefStore.setValue(PreferenceConstants.ACCEPTED_TYPES, IvyClasspathUtil.concat(setup
-                .getAcceptedTypes()));
-        prefStore.setValue(PreferenceConstants.SOURCES_TYPES, IvyClasspathUtil.concat(setup
-                .getSourceTypes()));
-        prefStore.setValue(PreferenceConstants.JAVADOC_TYPES, IvyClasspathUtil.concat(setup
-                .getJavadocTypes()));
-        prefStore.setValue(PreferenceConstants.SOURCES_SUFFIXES, IvyClasspathUtil.concat(setup
-                .getSourceSuffixes()));
-        prefStore.setValue(PreferenceConstants.JAVADOC_SUFFIXES, IvyClasspathUtil.concat(setup
-                .getJavadocSuffixes()));
-        prefStore.setValue(PreferenceConstants.MAP_IF_ONLY_ONE_SOURCE,
-                setup.isMapIfOnlyOneSource());
+    public void setMappingSetup(MappingSetup setup) {
+        prefStore.setValue(PreferenceConstants.SOURCES_TYPES,
+            IvyClasspathUtil.concat(setup.getSourceTypes()));
+        prefStore.setValue(PreferenceConstants.JAVADOC_TYPES,
+            IvyClasspathUtil.concat(setup.getJavadocTypes()));
+        prefStore.setValue(PreferenceConstants.SOURCES_SUFFIXES,
+            IvyClasspathUtil.concat(setup.getSourceSuffixes()));
+        prefStore.setValue(PreferenceConstants.JAVADOC_SUFFIXES,
+            IvyClasspathUtil.concat(setup.getJavadocSuffixes()));
+        prefStore
+                .setValue(PreferenceConstants.MAP_IF_ONLY_ONE_SOURCE, setup.isMapIfOnlyOneSource());
         prefStore.setValue(PreferenceConstants.MAP_IF_ONLY_ONE_JAVADOC,
-                setup.isMapIfOnlyOneJavadoc());
-    }
-
-    public boolean isAlphOrder() {
-        return prefStore.getBoolean(PreferenceConstants.ALPHABETICAL_ORDER);
-    }
-
-    public void setAlphOrder(boolean alpha) {
-        prefStore.setValue(PreferenceConstants.ALPHABETICAL_ORDER, alpha);
-    }
-
-    public boolean isResolveInWorkspace() {
-        return prefStore.getBoolean(PreferenceConstants.RESOLVE_IN_WORKSPACE);
-    }
-
-    public void setResolveInWorkspace(boolean inWorkspace) {
-        prefStore.setValue(PreferenceConstants.RESOLVE_IN_WORKSPACE, inWorkspace);
+            setup.isMapIfOnlyOneJavadoc());
     }
 
-    public boolean isResolveBeforeLaunch() {
-        return prefStore.getBoolean(PreferenceConstants.RESOLVE_BEFORE_LAUNCH);
-    }
-
-    public void setResolveBeforeLaunch(boolean resolveBeforeLaunch) {
-        prefStore.setValue(PreferenceConstants.RESOLVE_BEFORE_LAUNCH, resolveBeforeLaunch);
-    }
-
-    public boolean isUseExtendedResolveId() {
-        return prefStore.getBoolean(PreferenceConstants.USE_EXTENDED_RESOLVE_ID);
+    public AdvancedSetup getAdvancedSetup() {
+        AdvancedSetup setup = new AdvancedSetup();
+        setup.setResolveBeforeLaunch(prefStore
+                .getBoolean(PreferenceConstants.RESOLVE_BEFORE_LAUNCH));
+        setup.setUseExtendedResolveId(prefStore
+                .getBoolean(PreferenceConstants.USE_EXTENDED_RESOLVE_ID));
+        return setup;
     }
 
-    public void setUseExtendedResolveId(boolean useExtendedResolveId) {
-        prefStore.setValue(PreferenceConstants.USE_EXTENDED_RESOLVE_ID, useExtendedResolveId);
+    public void setAdvancedSetup(AdvancedSetup setup) {
+        prefStore
+                .setValue(PreferenceConstants.RESOLVE_BEFORE_LAUNCH, setup.isResolveBeforeLaunch());
+        prefStore.setValue(PreferenceConstants.USE_EXTENDED_RESOLVE_ID,
+            setup.isUseExtendedResolveId());
     }
 
     public String getOrganization() {
@@ -251,34 +265,6 @@ public class IvyDEPreferenceStoreHelper 
         PreferenceConverter.setValue(prefStore, PreferenceConstants.EDITOR_COLOR_TAG, color);
     }
 
-    public boolean isRetrievedClasspath() {
-        return prefStore.getBoolean(PreferenceConstants.RETRIEVED_CLASSPATH);
-    }
-
-    public void setRetrievedClasspath(boolean retrievedClasspath) {
-        prefStore.setValue(PreferenceConstants.RETRIEVED_CLASSPATH, retrievedClasspath);
-    }
-
-    public RetrieveSetup getRetrievedClasspathSetup() {
-        RetrieveSetup retrieveSetup = new RetrieveSetup();
-        retrieveSetup.setRetrievePattern(prefStore
-                .getString(PreferenceConstants.RETRIEVED_CLASSPATH_PATTERN));
-        retrieveSetup.setRetrieveSync(prefStore
-                .getBoolean(PreferenceConstants.RETRIEVED_CLASSPATH_SYNC));
-        retrieveSetup.setRetrieveTypes(prefStore
-                .getString(PreferenceConstants.RETRIEVED_CLASSPATH_TYPES));
-        return retrieveSetup;
-    }
-
-    public void setRetrievedClasspathSetup(RetrieveSetup retrieveSetup) {
-        prefStore.setValue(PreferenceConstants.RETRIEVED_CLASSPATH_PATTERN, retrieveSetup
-                .getRetrievePattern());
-        prefStore.setValue(PreferenceConstants.RETRIEVED_CLASSPATH_SYNC, retrieveSetup
-                .isRetrieveSync());
-        prefStore.setValue(PreferenceConstants.RETRIEVED_CLASSPATH_TYPES, retrieveSetup
-                .getRetrieveTypes());
-    }
-
     public boolean isOffline() {
         return prefStore.getBoolean(PreferenceConstants.OFFLINE);
     }

Added: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/MappingSetupPreferencePage.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/MappingSetupPreferencePage.java?rev=1195176&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/MappingSetupPreferencePage.java (added)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/MappingSetupPreferencePage.java Sun Oct 30 15:25:43 2011
@@ -0,0 +1,63 @@
+/*
+ *  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.ui.preferences;
+
+import org.apache.ivyde.eclipse.IvyPlugin;
+import org.apache.ivyde.eclipse.ui.MappingSetupEditor;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+public class MappingSetupPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
+
+    /** the ID of the preference page */
+    public static final String PEREFERENCE_PAGE_ID = "org.apache.ivyde.eclipse.ui.preferences.MappingSetupPreferencePage";
+
+    private MappingSetupEditor mappingSetupComposite;
+
+    public MappingSetupPreferencePage() {
+        setPreferenceStore(IvyPlugin.getDefault().getPreferenceStore());
+    }
+
+    public void init(IWorkbench workbench) {
+        setPreferenceStore(IvyPlugin.getDefault().getPreferenceStore());
+    }
+
+    protected Control createContents(Composite parent) {
+        mappingSetupComposite = new MappingSetupEditor(parent, SWT.NONE);
+        mappingSetupComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
+
+        mappingSetupComposite.init(IvyPlugin.getPreferenceStoreHelper().getMappingSetup());
+
+        return mappingSetupComposite;
+    }
+
+    public boolean performOk() {
+        IvyDEPreferenceStoreHelper helper = IvyPlugin.getPreferenceStoreHelper();
+        helper.setMappingSetup(mappingSetupComposite.getMappingSetup());
+        return true;
+    }
+
+    protected void performDefaults() {
+        mappingSetupComposite.init(PreferenceInitializer.DEFAULT_MAPPING_SETUP);
+    }
+}

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/MappingSetupPreferencePage.java
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

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=1195176&r1=1195175&r2=1195176&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 Sun Oct 30 15:25:43 2011
@@ -19,9 +19,11 @@ package org.apache.ivyde.eclipse.ui.pref
 
 import org.apache.ivy.util.Message;
 import org.apache.ivyde.eclipse.IvyPlugin;
-import org.apache.ivyde.eclipse.cpcontainer.ContainerMappingSetup;
+import org.apache.ivyde.eclipse.cpcontainer.AdvancedSetup;
+import org.apache.ivyde.eclipse.cpcontainer.ClasspathSetup;
 import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathUtil;
-import org.apache.ivyde.eclipse.cpcontainer.IvySettingsSetup;
+import org.apache.ivyde.eclipse.cpcontainer.MappingSetup;
+import org.apache.ivyde.eclipse.cpcontainer.SettingsSetup;
 import org.apache.ivyde.eclipse.retrieve.RetrieveSetup;
 import org.apache.ivyde.eclipse.ui.editors.xml.IXMLColorConstants;
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
@@ -43,16 +45,46 @@ public class PreferenceInitializer exten
 
     public static final boolean DEFAULT_LOAD_SETTINGS_ON_DEMAND = false;
 
-    public static final IvySettingsSetup DEFAULT_IVY_SETTINGS_SETUP = new IvySettingsSetup();
+    public static final SettingsSetup DEFAULT_SETTINGS_SETUP = new SettingsSetup();
 
     static {
-        DEFAULT_IVY_SETTINGS_SETUP.setIvySettingsPath(DEFAULT_IVYSETTINGS_PATH);
-        DEFAULT_IVY_SETTINGS_SETUP.setLoadSettingsOnDemand(DEFAULT_LOAD_SETTINGS_ON_DEMAND);
-        DEFAULT_IVY_SETTINGS_SETUP.setPropertyFiles(IvyClasspathUtil.split(DEFAULT_PROPERTY_FILES));
+        DEFAULT_SETTINGS_SETUP.setIvySettingsPath(DEFAULT_IVYSETTINGS_PATH);
+        DEFAULT_SETTINGS_SETUP.setLoadSettingsOnDemand(DEFAULT_LOAD_SETTINGS_ON_DEMAND);
+        DEFAULT_SETTINGS_SETUP.setPropertyFiles(IvyClasspathUtil.split(DEFAULT_PROPERTY_FILES));
     }
 
     public static final String DEFAULT_ACCEPTED_TYPES = "jar,bundle,ejb,maven-plugin";
 
+    public static final boolean DEFAULT_ALPHABETICAL_ORDER = false;
+
+    public static final boolean DEFAULT_RESOLVE_IN_WORKSPACE = false;
+
+    public static final boolean DEFAULT_RETRIEVED_CLASSPATH = false;
+
+    private static final String DEFAULT_RETRIEVED_CLASSPATH_PATTERN = "lib/[artifact]-[revision].[ext]";
+
+    private static final boolean DEFAULT_RETRIEVED_CLASSPATH_SYNC = false;
+
+    private static final String DEFAULT_RETRIEVED_CLASSPATH_TYPES = "jar";
+
+    public static final RetrieveSetup DEFAULT_RETRIEVED_CLASSPATH_SETUP = new RetrieveSetup();
+
+    static {
+        DEFAULT_RETRIEVED_CLASSPATH_SETUP.setRetrievePattern(DEFAULT_RETRIEVED_CLASSPATH_PATTERN);
+        DEFAULT_RETRIEVED_CLASSPATH_SETUP.setRetrieveSync(DEFAULT_RETRIEVED_CLASSPATH_SYNC);
+        DEFAULT_RETRIEVED_CLASSPATH_SETUP.setRetrieveTypes(DEFAULT_RETRIEVED_CLASSPATH_TYPES);
+    }
+
+    public static final ClasspathSetup DEFAULT_CLASSPATH_SETUP = new ClasspathSetup();
+
+    static {
+        DEFAULT_CLASSPATH_SETUP.setAcceptedTypes(IvyClasspathUtil.split(DEFAULT_ACCEPTED_TYPES));
+        DEFAULT_CLASSPATH_SETUP.setAlphaOrder(DEFAULT_ALPHABETICAL_ORDER);
+        DEFAULT_CLASSPATH_SETUP.setResolveInWorkspace(DEFAULT_RESOLVE_IN_WORKSPACE);
+        DEFAULT_CLASSPATH_SETUP.setRetrievedClasspath(DEFAULT_RETRIEVED_CLASSPATH);
+        DEFAULT_CLASSPATH_SETUP.setRetrieveSetup(DEFAULT_RETRIEVED_CLASSPATH_SETUP);
+    }
+
     public static final String DEFAULT_SOURCES_TYPES = "source";
 
     public static final String DEFAULT_JAVADOC_TYPES = "javadoc";
@@ -64,35 +96,31 @@ public class PreferenceInitializer exten
     public static final boolean DEFAULT_MAP_IF_ONLY_ONE_SOURCE = false;
 
     public static final boolean DEFAULT_MAP_IF_ONLY_ONE_JAVADOC = false;
-    
+
     public static final int DEFAULT_IVY_CONSOLE_LOG_MESSAGE = Message.MSG_INFO;
 
-    public static final ContainerMappingSetup DEFAULT_CONTAINER_MAPPING_SETUP =
-        new ContainerMappingSetup();
+    public static final MappingSetup DEFAULT_MAPPING_SETUP = new MappingSetup();
 
     static {
-        DEFAULT_CONTAINER_MAPPING_SETUP.setAcceptedTypes(IvyClasspathUtil
-                .split(DEFAULT_ACCEPTED_TYPES));
-        DEFAULT_CONTAINER_MAPPING_SETUP.setSourceTypes(IvyClasspathUtil
-                .split(DEFAULT_SOURCES_TYPES));
-        DEFAULT_CONTAINER_MAPPING_SETUP.setJavadocTypes(IvyClasspathUtil
-                .split(DEFAULT_JAVADOC_TYPES));
-        DEFAULT_CONTAINER_MAPPING_SETUP.setSourceSuffixes(IvyClasspathUtil
-                .split(DEFAULT_SOURCES_SUFFIXES));
-        DEFAULT_CONTAINER_MAPPING_SETUP.setJavadocSuffixes(IvyClasspathUtil
-                .split(DEFAULT_JAVADOC_SUFFIXES));
-        DEFAULT_CONTAINER_MAPPING_SETUP.setMapIfOnlyOneSource(DEFAULT_MAP_IF_ONLY_ONE_SOURCE);
-        DEFAULT_CONTAINER_MAPPING_SETUP.setMapIfOnlyOneJavadoc(DEFAULT_MAP_IF_ONLY_ONE_JAVADOC);
+        DEFAULT_MAPPING_SETUP.setSourceTypes(IvyClasspathUtil.split(DEFAULT_SOURCES_TYPES));
+        DEFAULT_MAPPING_SETUP.setJavadocTypes(IvyClasspathUtil.split(DEFAULT_JAVADOC_TYPES));
+        DEFAULT_MAPPING_SETUP.setSourceSuffixes(IvyClasspathUtil.split(DEFAULT_SOURCES_SUFFIXES));
+        DEFAULT_MAPPING_SETUP.setJavadocSuffixes(IvyClasspathUtil.split(DEFAULT_JAVADOC_SUFFIXES));
+        DEFAULT_MAPPING_SETUP.setMapIfOnlyOneSource(DEFAULT_MAP_IF_ONLY_ONE_SOURCE);
+        DEFAULT_MAPPING_SETUP.setMapIfOnlyOneJavadoc(DEFAULT_MAP_IF_ONLY_ONE_JAVADOC);
     }
 
-    public static final boolean DEFAULT_ALPHABETICAL_ORDER = false;
-
-    public static final boolean DEFAULT_RESOLVE_IN_WORKSPACE = false;
-
     public static final boolean DEFAULT_RESOLVE_BEFORE_LAUNCH = false;
 
     public static final boolean DEFAULT_USE_EXTENDED_RESOLVE_ID = false;
 
+    public static final AdvancedSetup DEFAULT_ADVANCED_SETUP = new AdvancedSetup();
+
+    static {
+        DEFAULT_ADVANCED_SETUP.setResolveBeforeLaunch(DEFAULT_RESOLVE_BEFORE_LAUNCH);
+        DEFAULT_ADVANCED_SETUP.setUseExtendedResolveId(DEFAULT_USE_EXTENDED_RESOLVE_ID);
+    }
+
     public static final int DEFAULT_RESOLVE_ON_STARTUP = 1;
 
     public static final boolean DEFAULT_AUTO_RESOLVE_ON_CLOSE = true;
@@ -105,23 +133,6 @@ public class PreferenceInitializer exten
 
     public static final boolean DEFAULT_IGNORE_VERSION_ON_WORKSPACE_PROJECTS = false;
 
-    public static final boolean DEFAULT_RETRIEVED_CLASSPATH = false;
-
-    private static final String DEFAULT_RETRIEVED_CLASSPATH_PATTERN =
-        "lib/[artifact]-[revision].[ext]";
-
-    private static final boolean DEFAULT_RETRIEVED_CLASSPATH_SYNC = false;
-
-    private static final String DEFAULT_RETRIEVED_CLASSPATH_TYPES = "jar";
-
-    public static final RetrieveSetup DEFAULT_RETRIEVED_CLASSPATH_SETUP = new RetrieveSetup();
-
-    static {
-        DEFAULT_RETRIEVED_CLASSPATH_SETUP.setRetrievePattern(DEFAULT_RETRIEVED_CLASSPATH_PATTERN);
-        DEFAULT_RETRIEVED_CLASSPATH_SETUP.setRetrieveSync(DEFAULT_RETRIEVED_CLASSPATH_SYNC);
-        DEFAULT_RETRIEVED_CLASSPATH_SETUP.setRetrieveTypes(DEFAULT_RETRIEVED_CLASSPATH_TYPES);
-    }
-
     public static final boolean DEFAULT_OFFLINE = false;
 
     public static final boolean DEFAULT_ERROR_POPUP = true;
@@ -140,10 +151,9 @@ public class PreferenceInitializer exten
         store.setDefault(PreferenceConstants.JAVADOC_TYPES, DEFAULT_JAVADOC_TYPES);
         store.setDefault(PreferenceConstants.SOURCES_SUFFIXES, DEFAULT_SOURCES_SUFFIXES);
         store.setDefault(PreferenceConstants.JAVADOC_SUFFIXES, DEFAULT_JAVADOC_SUFFIXES);
-        store.setDefault(PreferenceConstants.MAP_IF_ONLY_ONE_SOURCE,
-                DEFAULT_MAP_IF_ONLY_ONE_SOURCE);
+        store.setDefault(PreferenceConstants.MAP_IF_ONLY_ONE_SOURCE, DEFAULT_MAP_IF_ONLY_ONE_SOURCE);
         store.setDefault(PreferenceConstants.MAP_IF_ONLY_ONE_JAVADOC,
-                DEFAULT_MAP_IF_ONLY_ONE_JAVADOC);
+            DEFAULT_MAP_IF_ONLY_ONE_JAVADOC);
 
         store.setDefault(PreferenceConstants.ALPHABETICAL_ORDER, DEFAULT_ALPHABETICAL_ORDER);
         store.setDefault(PreferenceConstants.RESOLVE_IN_WORKSPACE, DEFAULT_RESOLVE_IN_WORKSPACE);
@@ -155,11 +165,9 @@ public class PreferenceInitializer exten
 
         store.setDefault(PreferenceConstants.AUTO_RESOLVE_ON_CLOSE, DEFAULT_AUTO_RESOLVE_ON_CLOSE);
         store.setDefault(PreferenceConstants.AUTO_RESOLVE_ON_OPEN, DEFAULT_AUTO_RESOLVE_ON_OPEN);
-        store.setDefault(PreferenceConstants.AUTO_RESOLVE_ON_CHANGE,
-            DEFAULT_AUTO_RESOLVE_ON_CHANGE);
+        store.setDefault(PreferenceConstants.AUTO_RESOLVE_ON_CHANGE, DEFAULT_AUTO_RESOLVE_ON_CHANGE);
 
-        store.setDefault(PreferenceConstants.IVY_CONSOLE_LOG_LEVEL,
-            DEFAULT_IVY_CONSOLE_LOG_MESSAGE);
+        store.setDefault(PreferenceConstants.IVY_CONSOLE_LOG_LEVEL, DEFAULT_IVY_CONSOLE_LOG_MESSAGE);
 
         store.setDefault(PreferenceConstants.IGNORE_BRANCH_ON_WORKSPACE_PROJECTS,
             DEFAULT_IGNORE_BRANCH_ON_WORKSPACE_PROJECTS);



Mime
View raw message