Author: pkluegl
Date: Thu Nov 10 14:56:31 2011
New Revision: 1200355
URL: http://svn.apache.org/viewvc?rev=1200355&view=rev
Log:
UIMA-2280
moved the preference to a new preference page in the ide plugin
Added:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferencePage.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceConstants.java
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceInitializer.java
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceConstants.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceInitializer.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferencePage.java
Modified: uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml?rev=1200355&r1=1200354&r2=1200355&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml Thu Nov 10 14:56:31 2011
@@ -88,6 +88,12 @@
id="org.apache.uima.caseditor.ide.AnnotationEditorPreference"
name="UIMA Annotation Editor">
</page>
+ <page
+ category="org.apache.uima.caseditor.ide.AnnotationEditorPreference"
+ class="org.apache.uima.caseditor.ide.CasEditorIdePreferencePage"
+ id="org.apache.uima.caseditor.ide.CasEditorIdePreference"
+ name="Cas Editor Ide">
+ </page>
</extension>
<extension
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceConstants.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceConstants.java?rev=1200355&r1=1200354&r2=1200355&view=diff
==============================================================================
---
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceConstants.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceConstants.java
Thu Nov 10 14:56:31 2011
@@ -27,4 +27,7 @@ public class CasEditorIdePreferenceConst
"CAS_IMPORT_WIZARD_LAST_USED_LANG";
public static final String CAS_IMPORT_WIZARD_LAST_USED_ENCODINGS =
"CAS_IMPORT_WIZARD_ENCODINGS";
+
+ public static final String CAS_EDITOR_REMEMBER_TYPESYSTEM =
"CAS_EDITOR_REMEMBER_TYPESYSTEM";
+
}
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceInitializer.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceInitializer.java?rev=1200355&r1=1200354&r2=1200355&view=diff
==============================================================================
---
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceInitializer.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceInitializer.java
Thu Nov 10 14:56:31 2011
@@ -34,5 +34,8 @@ public class CasEditorIdePreferenceIniti
store.setDefault(CasEditorIdePreferenceConstants.CAS_IMPORT_WIZARD_LAST_USED_ENCODINGS,
Charset.defaultCharset().displayName());
+
+
store.setDefault(CasEditorIdePreferenceConstants.CAS_EDITOR_REMEMBER_TYPESYSTEM,
true);
+
}
}
Added:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferencePage.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferencePage.java?rev=1200355&view=auto
==============================================================================
---
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferencePage.java
(added)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferencePage.java
Thu Nov 10 14:56:31 2011
@@ -0,0 +1,56 @@
+/*
+ * 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.uima.caseditor.ide;
+
+import org.eclipse.jface.preference.BooleanFieldEditor;
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+/**
+ * Preference page to manage preferences for the ide plugin.
+ */
+public class CasEditorIdePreferencePage extends FieldEditorPreferencePage
+ implements IWorkbenchPreferencePage {
+
+ private BooleanFieldEditor mEditorRememberTypesystem;
+
+ public CasEditorIdePreferencePage() {
+ setPreferenceStore(CasEditorIdePlugin.getDefault().getPreferenceStore());
+ setDescription("Cas Editor Ide Preferences.");
+ }
+
+
+ @Override
+ protected void createFieldEditors() {
+
+ // should the editor use the last selected type system to open the cas?
+ mEditorRememberTypesystem = new
BooleanFieldEditor(CasEditorIdePreferenceConstants.CAS_EDITOR_REMEMBER_TYPESYSTEM,
+ "Use the previously selected type system to open a CAS",
getFieldEditorParent());
+ addField(mEditorRememberTypesystem);
+
+
+ }
+
+ public void init(IWorkbench workbench) {
+ }
+
+
+}
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java?rev=1200355&r1=1200354&r2=1200355&view=diff
==============================================================================
---
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
Thu Nov 10 14:56:31 2011
@@ -34,7 +34,6 @@ import org.apache.uima.caseditor.CasEdit
import org.apache.uima.caseditor.core.model.DefaultColors;
import org.apache.uima.caseditor.core.model.dotcorpus.DotCorpus;
import org.apache.uima.caseditor.core.model.dotcorpus.DotCorpusSerializer;
-import org.apache.uima.caseditor.editor.AnnotationEditorPreferenceConstants;
import org.apache.uima.caseditor.editor.AnnotationStyle;
import org.apache.uima.caseditor.editor.CasDocumentProvider;
import org.apache.uima.caseditor.editor.DocumentFormat;
@@ -217,9 +216,9 @@ public class DefaultCasDocumentProvider
// set by the editor for this specific CAS.
// apply that type system only if the setting is active in the
preferences
String typeSystemFileString = null;
- IPreferenceStore prefStore =
CasEditorPlugin.getDefault().getPreferenceStore();
+ IPreferenceStore prefStore =
CasEditorIdePlugin.getDefault().getPreferenceStore();
boolean useLastTypesystem = prefStore
-
.getBoolean(AnnotationEditorPreferenceConstants.ANNOTATION_EDITOR_REMEMBER_TYPESYSTEM);
+
.getBoolean(CasEditorIdePreferenceConstants.CAS_EDITOR_REMEMBER_TYPESYSTEM);
if (useLastTypesystem) {
typeSystemFileString = documentToTypeSystemMap
.get(casFile.getFullPath().toPortableString());
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceConstants.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceConstants.java?rev=1200355&r1=1200354&r2=1200355&view=diff
==============================================================================
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceConstants.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceConstants.java
Thu Nov 10 14:56:31 2011
@@ -29,5 +29,5 @@ public class AnnotationEditorPreferenceC
public static final String EDITOR_LINE_LENGTH_HINT =
"EDITOR_LINE_LENGTH_HINT";
- public static final String ANNOTATION_EDITOR_REMEMBER_TYPESYSTEM =
CasEditorPlugin.ID +".rememberTypesystem";
+
}
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceInitializer.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceInitializer.java?rev=1200355&r1=1200354&r2=1200355&view=diff
==============================================================================
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceInitializer.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceInitializer.java
Thu Nov 10 14:56:31 2011
@@ -29,6 +29,5 @@ public class AnnotationEditorPreferenceI
IPreferenceStore store =
CasEditorPlugin.getDefault().getPreferenceStore();
store.setDefault(AnnotationEditorPreferenceConstants.EDITOR_LINE_LENGTH_HINT,
80);
store.setDefault(AnnotationEditorPreferenceConstants.ANNOTATION_EDITOR_TEXT_SIZE,
13);
-
store.setDefault(AnnotationEditorPreferenceConstants.ANNOTATION_EDITOR_REMEMBER_TYPESYSTEM,
true);
}
}
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferencePage.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferencePage.java?rev=1200355&r1=1200354&r2=1200355&view=diff
==============================================================================
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferencePage.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferencePage.java
Thu Nov 10 14:56:31 2011
@@ -20,7 +20,6 @@
package org.apache.uima.caseditor.editor;
import org.apache.uima.caseditor.CasEditorPlugin;
-import org.eclipse.jface.preference.BooleanFieldEditor;
import org.eclipse.jface.preference.FieldEditorPreferencePage;
import org.eclipse.jface.preference.IntegerFieldEditor;
import org.eclipse.ui.IWorkbench;
@@ -34,7 +33,6 @@ public class AnnotationEditorPreferenceP
private IntegerFieldEditor mEditorLineLengthHint;
private IntegerFieldEditor mEditorTextSize;
- private BooleanFieldEditor mEditorRememberTypesystem;
public AnnotationEditorPreferencePage() {
setPreferenceStore(CasEditorPlugin.getDefault().getPreferenceStore());
@@ -55,14 +53,6 @@ public class AnnotationEditorPreferenceP
AnnotationEditorPreferenceConstants.ANNOTATION_EDITOR_TEXT_SIZE,
"Editor Text Size", getFieldEditorParent());
addField(mEditorTextSize);
-
- // editor text size
- mEditorRememberTypesystem = new BooleanFieldEditor(
-
AnnotationEditorPreferenceConstants.ANNOTATION_EDITOR_REMEMBER_TYPESYSTEM,
- "Use the previously selected type system to open a CAS",
getFieldEditorParent());
- addField(mEditorRememberTypesystem);
-
-
}
public void init(IWorkbench workbench) {
