Changeset 3878

Timestamp:

Jul 24, 2008, 3:49:54 PM (13 years ago)

Author:

yura

Message:

• RfpProject? reads project properties without UI.

Location:

devel-tools/trunk/eclipse

Files:

• org.refal.rfpdt.core/src/org/refal/rfpdt/core/ICompilerPreferences.java (added)
• org.refal.rfpdt.core/src/org/refal/rfpdt/core/RfpProject.java (modified) (4 diffs)
• org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/RfpUI.java (modified) (3 diffs)
• org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/preferences/IPreferenceConstants.java (modified) (2 diffs)

devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/core/RfpProject.java

@@ -10 +10 @@
 import org.eclipse.core.resources.IResourceVisitor;
 import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ProjectScope;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.preferences.DefaultScope;
+import org.eclipse.core.runtime.preferences.IScopeContext;
+import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.IJavaProject;
@@ -20 +25 @@
     private final IJavaProject javaProject;
     private final IWorkspaceRoot workspaceRoot;
+    private final IScopeContext[] scopes;
 
     RfpProject (IProject project) {
@@ -25 +31 @@
         this.javaProject = JavaCore.create(project);
         this.workspaceRoot = project.getWorkspace().getRoot();
+        this.scopes = new IScopeContext[] { new ProjectScope(project), new InstanceScope(), new DefaultScope() };
     }
 
@@ -163 +170 @@
     }
 
-    private boolean addLineNumber = true;
-    private boolean addVariableNames = true;
-    private boolean addSource = true;
-
     public boolean getCompilerOptionAddLineNumber () {
-        return addLineNumber;
+        return Platform.getPreferencesService().getBoolean(ICompilerPreferences.QUALIFIER,
+                ICompilerPreferences.ADD_LINE_NUMBERS, false, scopes);
     }
 
     public boolean getCompilerOptionAddVariableNames () {
-        return addVariableNames;
+        return Platform.getPreferencesService().getBoolean(ICompilerPreferences.QUALIFIER,
+                ICompilerPreferences.ADD_VARIABLE_NAMES, false, scopes);
     }
 
     public boolean getCompilerOptionAddSource () {
-        return addSource;
-    }
-
-    public void setCompilerOptionAddLineNumber (boolean newValue) {
-        addLineNumber = newValue;
-    }
-
-    public void setCompilerOptionAddVariableNames (boolean newValue) {
-        addVariableNames = newValue;
-    }
-
-    public void setCompilerOptionAddSource (boolean newValue) {
-        addSource = newValue;
+        return Platform.getPreferencesService().getBoolean(ICompilerPreferences.QUALIFIER,
+                ICompilerPreferences.ADD_SOURCE, false, scopes);
     }
 

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/RfpUI.java

@@ -9 +9 @@
 import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbenchPage;
@@ -17 +15 @@
 import org.eclipse.ui.preferences.ScopedPreferenceStore;
 import org.osgi.framework.BundleContext;
-import org.refal.rfpdt.core.RfpCore;
 import org.refal.rfpdt.editor.RfpPartitionScanner;
-import org.refal.rfpdt.ui.preferences.IPreferenceConstants;
 import org.refal.rfpdt.ui.preferences.ProjectPropertiesStore;
 
@@ -138 +134 @@
             stores.put(project, store);
         }
-        store.addPropertyChangeListener(new IPropertyChangeListener() {
-            public void propertyChange (PropertyChangeEvent event) {
-                if (IPreferenceConstants.COMPILER_ADD_LINE_NUMBERS.equals(event.getProperty()))
-                    RfpCore.getRfpProject(project).setCompilerOptionAddLineNumber((Boolean) event.getNewValue());
-                else if (IPreferenceConstants.COMPILER_ADD_VARIABLE_NAMES.equals(event.getProperty()))
-                    RfpCore.getRfpProject(project).setCompilerOptionAddVariableNames((Boolean) event.getNewValue());
-                else if (IPreferenceConstants.COMPILER_ADD_SOURCE.equals(event.getProperty()))
-                    RfpCore.getRfpProject(project).setCompilerOptionAddSource((Boolean) event.getNewValue());
-            }
-
-        });
-        RfpCore.getRfpProject(project).setCompilerOptionAddLineNumber(store.getBoolean(IPreferenceConstants.COMPILER_ADD_LINE_NUMBERS));
-        RfpCore.getRfpProject(project).setCompilerOptionAddVariableNames(store.getBoolean(IPreferenceConstants.COMPILER_ADD_VARIABLE_NAMES));
-        RfpCore.getRfpProject(project).setCompilerOptionAddSource(store.getBoolean(IPreferenceConstants.COMPILER_ADD_SOURCE));
         return store;
     }

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/preferences/IPreferenceConstants.java

@@ -1 +1 @@
 package org.refal.rfpdt.ui.preferences;
+
+import org.refal.rfpdt.core.ICompilerPreferences;
 
 /**
@@ -19 +21 @@
     public String MATCHING_BRACKETS = PREFIX + "matchingBrackets"; //$NON-NLS-1$
     public String MATCHING_BRACKETS_COLOR = PREFIX + "matchingBracketsColor"; //$NON-NLS-1$
-    public String COMPILER_ADD_VARIABLE_NAMES = PREFIX + "compilerVarNames"; //$NON-NLS-1$
-    public String COMPILER_ADD_LINE_NUMBERS = PREFIX + "compilerLineNumbers"; //$NON-NLS-1$
-    public String COMPILER_ADD_SOURCE = PREFIX + "compilerSource"; //$NON-NLS-1$
+
+    public String COMPILER_ADD_LINE_NUMBERS = ICompilerPreferences.ADD_LINE_NUMBERS;
+    public String COMPILER_ADD_SOURCE = ICompilerPreferences.ADD_SOURCE;
+    public String COMPILER_ADD_VARIABLE_NAMES = ICompilerPreferences.ADD_VARIABLE_NAMES;
 
     public String SYMBOL = PREFIX + "symbol";