svn commit: r1195176 [3/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...

[hibou]

Copied: 
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/SettingsSetupPreferencePage.java
 (from r1190201, 
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/SettingsPreferencePage.java)
URL: 
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/SettingsSetupPreferencePage.java?p2=ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/SettingsSetupPreferencePage.java&p1=ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/SettingsPreferencePage.java&r1=1190201&r2=1195176&rev=1195176&view=diff
==============================================================================
--- 
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/SettingsPreferencePage.java
 (original)
+++ 
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/SettingsSetupPreferencePage.java
 Sun Oct 30 15:25:43 2011
@@ -18,25 +18,23 @@
 package org.apache.ivyde.eclipse.ui.preferences;
 
 import org.apache.ivyde.eclipse.IvyPlugin;
-import org.apache.ivyde.eclipse.ui.SettingsEditor;
+import org.apache.ivyde.eclipse.ui.SettingsSetupEditor;
 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.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 
-public class SettingsPreferencePage extends PreferencePage implements 
IWorkbenchPreferencePage {
+public class SettingsSetupPreferencePage extends PreferencePage implements 
IWorkbenchPreferencePage {
 
     /** the ID of the preference page */
-    public static final String PEREFERENCE_PAGE_ID =
-        "org.apache.ivyde.eclipse.ui.preferences.SettingsPreferencePage";
+    public static final String PEREFERENCE_PAGE_ID = 
"org.apache.ivyde.eclipse.ui.preferences.SettingsSetupPreferencePage";
 
-    private SettingsEditor settingsEditor;
+    private SettingsSetupEditor settingsEditor;
 
-    public SettingsPreferencePage() {
+    public SettingsSetupPreferencePage() {
         setPreferenceStore(IvyPlugin.getDefault().getPreferenceStore());
     }
 
@@ -45,32 +43,21 @@ public class SettingsPreferencePage exte
     }
 
     protected Control createContents(Composite parent) {
-        Composite composite = new Composite(parent, SWT.NONE);
-        // CheckStyle:MagicNumber| OFF
-        composite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, 
true, false));
-        composite.setLayout(new GridLayout());
-
-        settingsEditor = new SettingsEditor(composite, SWT.NONE);
+        settingsEditor = new SettingsSetupEditor(parent, SWT.NONE);
         settingsEditor.setLayoutData(new GridData(GridData.FILL, 
GridData.FILL, true, true));
-        // CheckStyle:MagicNumber| ON
-
-        initPreferences();
 
-        return composite;
-    }
+        
settingsEditor.init(IvyPlugin.getPreferenceStoreHelper().getSettingsSetup());
 
-    private void initPreferences() {
-        IvyDEPreferenceStoreHelper helper = 
IvyPlugin.getPreferenceStoreHelper();
-        settingsEditor.init(helper.getIvySettingsSetup());
+        return settingsEditor;
     }
 
     public boolean performOk() {
         IvyDEPreferenceStoreHelper helper = 
IvyPlugin.getPreferenceStoreHelper();
-        helper.setIvySettingsSetup(settingsEditor.getIvySettingsSetup());
+        helper.setSettingsSetup(settingsEditor.getIvySettingsSetup());
         return true;
     }
 
     protected void performDefaults() {
-        settingsEditor.init(PreferenceInitializer.DEFAULT_IVY_SETTINGS_SETUP);
+        settingsEditor.init(PreferenceInitializer.DEFAULT_SETTINGS_SETUP);
     }
 }

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

Propchange: 
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/SettingsSetupPreferencePage.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/SettingsSetupPreferencePage.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain