[jbosstools-commits] JBoss Tools SVN: r17585 - in trunk/common/plugins/org.jboss.tools.common.model: src/org/jboss/tools/common/model/options and 1 other directory.

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Tue Sep 15 08:58:14 EDT 2009 

Author: scabanovich
Date: 2009-09-15 08:58:14 -0400 (Tue, 15 Sep 2009)
New Revision: 17585

Modified:
   trunk/common/plugins/org.jboss.tools.common.model/resources/meta/options_general.xml
   trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_eclipse_option.meta
   trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_option.meta
   trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/Preference.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4885
Node 'Editors' moved to Option root

Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/options_general.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/options_general.xml	2009-09-15 12:26:34 UTC (rev 17584)
+++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/options_general.xml	2009-09-15 12:58:14 UTC (rev 17585)
@@ -4431,6 +4431,10 @@
 		</Icons>
 	</XStudioIcons>
 	<Options model-entity="SharableOptions" NAME="Options" SCOPE="project">
+		<Editors model-entity="SharableEditors" NAME="Editors" SCOPE="project">
+			<StrutsEditor model-entity="SharableStrutsEditor" NAME="Web Flow Diagram"
+				SCOPE="project" grid_step="16" show_grid="yes" />
+		</Editors>
 		<JSFStudio model-entity="SharableJSFStudio" NAME="JSF Studio"
 			SCOPE="project">
 			<JSFProject model-entity="SharableJSFProject" NAME="Project"
@@ -4517,10 +4521,6 @@
 						text="errors.required={0} is required.\nerrors.minlength={0} can not be less than {1} characters.\nerrors.maxlength={0} can not be greater than {1} characters.\nerrors.invalid={0} is invalid.\n \nerrors.byte={0} must be a byte.\nerrors.short={0} must be a short.\nerrors.integer={0} must be an integer.\nerrors.long={0} must be a long.\nerrors.float={0} must be a float.\nerrors.double={0} must be a double.\n \nerrors.date={0} is not a date.\nerrors.range={0} is not in the range {1} through {2}.\nerrors.creditcard={0} is an invalid credit card number.\nerrors.email={0} is an invalid e-mail address.\n" />
 				</ResourcesInsets>
 			</Automation>
-			<Editors model-entity="SharableEditors" NAME="Editors" SCOPE="project">
-				<StrutsEditor model-entity="SharableStrutsEditor" NAME="Web Flow Diagram"
-					SCOPE="project" grid_step="16" show_grid="yes" />
-			</Editors>
 		</StrutsStudio>
 	</Options>
 </XStudio>
\ No newline at end of file

Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_eclipse_option.meta
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_eclipse_option.meta	2009-09-15 12:26:34 UTC (rev 17584)
+++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_eclipse_option.meta	2009-09-15 12:58:14 UTC (rev 17585)
@@ -193,52 +193,6 @@
   <XActionItem kind="list"/>
   <XDependencies/>
  </XModelEntity>
- <XModelEntity ImplementingClass="%Options%" name="SharableEditors">
-  <XChildrenEntities>
-   <XChildEntity maxCount="1" name="SharableStrutsEditor" required="yes"/>
-   <XChildEntity maxCount="1" name="SharableJSFEditor" required="yes"/>
-   <XChildEntity maxCount="1" name="SharableTilesEditor" required="yes"/>
-   <XChildEntity maxCount="1" name="SharableVPEEditor" required="yes"/>
-   <XChildEntity maxCount="1" name="SharableSeamPagesEditor" required="yes"/>
-  </XChildrenEntities>
-  <XEntityRenderer>
-   <ICONS>
-    <ICON info="main.xstudio.options.root" type="main"/>
-   </ICONS>
-  </XEntityRenderer>
-  <XModelAttributes>
-   <XModelAttribute default="options" loader="ElementType"
-    name="element type" visibility="false">
-    <Editor name="Uneditable"/>
-   </XModelAttribute>
-   <XModelAttribute default="Editors" name="name" visibility="false" xmlname="NAME">
-    <Editor name="Uneditable"/>
-   </XModelAttribute>
-   <XModelAttribute default="yes" name="useRedHatEditors" xmlname="useRedHatEditors">
-    <Constraint loader="List">
-     <value name="yes"/>
-     <value name="no"/>
-    </Constraint>
-    <Editor name="CheckBox"/>
-   </XModelAttribute>
-   <XModelAttribute default="yes" name="natureWarning" xmlname="natureWarning">
-    <Constraint loader="List">
-     <value name="yes"/>
-     <value name="no"/>
-    </Constraint>
-    <Editor name="CheckBox"/>
-   </XModelAttribute>
-   <XModelAttribute default="no" name="selectSourceTab" xmlname="selectSourceTab">
-    <Constraint loader="List">
-     <value name="yes"/>
-     <value name="no"/>
-    </Constraint>
-    <Editor name="CheckBox"/>
-   </XModelAttribute>
-  </XModelAttributes>
-  <XActionItem kind="list"/>
-  <XDependencies/>
- </XModelEntity>
  <XModelEntity ImplementingClass="%Options%" name="SharableImportJSFProject">
   <XChildrenEntities/>
   <XEntityRenderer>
@@ -1139,7 +1093,6 @@
   <XChildrenEntities>
    <XChildEntity maxCount="1" name="SharableRunning" required="yes"/>
    <XChildEntity maxCount="1" name="SharableProject" required="yes"/>
-   <XChildEntity maxCount="1" name="SharableEditors" required="yes"/>
    <XChildEntity maxCount="1" name="SharableAutomation" required="yes"/>
    <XChildEntity maxCount="1" name="SharableCodeGeneration" required="yes"/>
    <XChildEntity maxCount="1" name="SharableLinkRecognizer" required="yes"/>
@@ -1373,6 +1326,16 @@
   </XActionItem>
   <XDependencies/>
  </XModelEntity>
+ <XEntityExtension name="SharableEditors">
+  <XChildrenEntities>
+   <XChildEntity maxCount="1" name="SharableStrutsEditor" required="yes"/>
+   <XChildEntity maxCount="1" name="SharableJSFEditor" required="yes"/>
+   <XChildEntity maxCount="1" name="SharableTilesEditor" required="yes"/>
+   <XChildEntity maxCount="1" name="SharableVPEEditor" required="yes"/>
+   <XChildEntity maxCount="1" name="SharableSeamPagesEditor" required="yes"/>
+  </XChildrenEntities>
+  <XActionItem kind="list"/>
+ </XEntityExtension>
  <XEntityExtension name="SharableOptions">
   <XChildrenEntities>
    <XChildEntity maxCount="1" name="SharableJSFStudio" required="yes"/>

Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_option.meta
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_option.meta	2009-09-15 12:26:34 UTC (rev 17584)
+++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_option.meta	2009-09-15 12:58:14 UTC (rev 17585)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE XModelEntityGroup PUBLIC "-//Red Hat, Inc.//DTD Meta 1.0//EN" "meta.dtd">
+<!DOCTYPE XModelEntityGroup PUBLIC "-//Red Hat, Inc.//DTD Meta 1.0//EN"
+                                   "meta.dtd">
 <XModelEntityGroup>
  <VERSION MODULE="Model" VERSION="1.0"/>
  <MAPPINGS>
@@ -22,17 +23,12 @@
   </XEntityRenderer>
   <XModelAttributes>
    <XModelAttribute default="root" loader="ElementType" name="element type">
-    <Constraint/>
     <Editor name="Uneditable"/>
    </XModelAttribute>
    <XModelAttribute default="Root" name="name" visibility="false" xmlname="NAME">
-    <Constraint/>
     <Editor name="Uneditable"/>
    </XModelAttribute>
-   <XModelAttribute default="Root" name="project name" visibility="false">
-    <Constraint/>
-    <Editor/>
-   </XModelAttribute>
+   <XModelAttribute default="Root" name="project name" visibility="false"/>
   </XModelAttributes>
   <XActionItem kind="list">
    <XActionItem
@@ -51,11 +47,9 @@
   <XModelAttributes>
    <XModelAttribute default="editor options" loader="ElementType"
     name="element type" visibility="false">
-    <Constraint/>
     <Editor name="Uneditable"/>
    </XModelAttribute>
    <XModelAttribute default="Editor" name="name" visibility="false" xmlname="NAME">
-    <Constraint/>
     <Editor name="Uneditable"/>
    </XModelAttribute>
    <XModelAttribute default="4" name="tab size" xmlname="TAB_SIZE">
@@ -95,6 +89,46 @@
   <XActionItem kind="list"/>
   <XDependencies/>
  </XModelEntity>
+ <XModelEntity ImplementingClass="%Options%" name="SharableEditors">
+  <XChildrenEntities/>
+  <XEntityRenderer>
+   <ICONS>
+    <ICON info="main.xstudio.options.root" type="main"/>
+   </ICONS>
+  </XEntityRenderer>
+  <XModelAttributes>
+   <XModelAttribute default="options" loader="ElementType"
+    name="element type" visibility="false">
+    <Editor name="Uneditable"/>
+   </XModelAttribute>
+   <XModelAttribute default="Editors" name="name" visibility="false" xmlname="NAME">
+    <Editor name="Uneditable"/>
+   </XModelAttribute>
+   <XModelAttribute default="yes" name="useRedHatEditors" xmlname="useRedHatEditors">
+    <Constraint loader="List">
+     <value name="yes"/>
+     <value name="no"/>
+    </Constraint>
+    <Editor name="CheckBox"/>
+   </XModelAttribute>
+   <XModelAttribute default="yes" name="natureWarning" xmlname="natureWarning">
+    <Constraint loader="List">
+     <value name="yes"/>
+     <value name="no"/>
+    </Constraint>
+    <Editor name="CheckBox"/>
+   </XModelAttribute>
+   <XModelAttribute default="no" name="selectSourceTab" xmlname="selectSourceTab">
+    <Constraint loader="List">
+     <value name="yes"/>
+     <value name="no"/>
+    </Constraint>
+    <Editor name="CheckBox"/>
+   </XModelAttribute>
+  </XModelAttributes>
+  <XActionItem kind="list"/>
+  <XDependencies/>
+ </XModelEntity>
  <XModelEntity ImplementingClass="%Options%" XMLSUBPATH="EDITOR" name="SharableExternalEditor">
   <XChildrenEntities/>
   <XEntityRenderer>
@@ -105,13 +139,9 @@
   <XModelAttributes>
    <XModelAttribute default="editor" loader="ElementType"
     name="element type" visibility="false">
-    <Constraint/>
     <Editor name="Uneditable"/>
    </XModelAttribute>
-   <XModelAttribute name="name" xmlname="NAME">
-    <Constraint/>
-    <Editor/>
-   </XModelAttribute>
+   <XModelAttribute name="name" xmlname="NAME"/>
    <XModelAttribute name="path" xmlname="PATH">
     <Constraint loader="FileFilter">
      <value name="allFiles=false"/>
@@ -156,25 +186,20 @@
   <XModelAttributes>
    <XModelAttribute default="partition" loader="ElementType"
     name="element type" visibility="false">
-    <Constraint/>
     <Editor name="Uneditable"/>
    </XModelAttribute>
    <XModelAttribute default="External Programs" name="name"
     visibility="false" xmlname="NAME">
-    <Constraint/>
     <Editor name="Uneditable"/>
    </XModelAttribute>
-   <XModelAttribute name="extensions" xmlname="EXTENSIONS">
-    <Constraint/>
-    <Editor/>
-   </XModelAttribute>
+   <XModelAttribute name="extensions" xmlname="EXTENSIONS"/>
   </XModelAttributes>
   <XActionItem kind="list">
    <XActionItem ICON="action.newpackage" displayName="Create"
     kind="list" name="CreateActions">
-    <XActionItem HandlerClassName="%Create%"
-     ICON="action.empty" PROPERTIES="input=no"
-     WizardClassName="%Default%" displayName="Add New..." kind="action" name="CreateEditor">
+    <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+     PROPERTIES="input=no" WizardClassName="%Default%"
+     displayName="Add New..." kind="action" name="CreateEditor">
      <EntityData EntityName="SharableExternalEditor">
       <AttributeData AttributeName="name"/>
       <AttributeData AttributeName="path"/>
@@ -185,7 +210,9 @@
   <XDependencies/>
  </XModelEntity>
  <XModelEntity ImplementingClass="%Options%" name="SharableOptions">
-  <XChildrenEntities/>
+  <XChildrenEntities>
+   <XChildEntity maxCount="1" name="SharableEditors" required="yes"/>
+  </XChildrenEntities>
   <XEntityRenderer>
    <ICONS>
     <ICON info="main.xstudio.options.root" type="main"/>
@@ -194,11 +221,9 @@
   <XModelAttributes>
    <XModelAttribute default="options" loader="ElementType"
     name="element type" visibility="false">
-    <Constraint/>
     <Editor name="Uneditable"/>
    </XModelAttribute>
    <XModelAttribute default="Options" name="name" visibility="false" xmlname="NAME">
-    <Constraint/>
     <Editor name="Uneditable"/>
    </XModelAttribute>
   </XModelAttributes>
@@ -215,11 +240,9 @@
   <XModelAttributes>
    <XModelAttribute default="preferences" loader="ElementType"
     name="element type" visibility="false">
-    <Constraint/>
     <Editor name="Uneditable"/>
    </XModelAttribute>
    <XModelAttribute default="Preferences" name="name" visibility="false" xmlname="NAME">
-    <Constraint/>
     <Editor name="Uneditable"/>
    </XModelAttribute>
    <XModelAttribute default="10" name="undo capacity" xmlname="UNDO_CAPACITY">
@@ -228,10 +251,7 @@
    </XModelAttribute>
    <XModelAttribute
     default="FLOW:*.txt,*.xml;HTML:*.htm,*html;XML:*.xml;XSL:*.xsl;DTD:*.dtd"
-    name="location filters" visibility="false" xmlname="LOCATION_FILTERS">
-    <Constraint/>
-    <Editor/>
-   </XModelAttribute>
+    name="location filters" visibility="false" xmlname="LOCATION_FILTERS"/>
    <XModelAttribute default="no" name="show modifiers" xmlname="SHOW_MODIFIERS">
     <Constraint loader="List">
      <value name="no"/>
@@ -262,19 +282,12 @@
     <Editor name="List"/>
    </XModelAttribute>
    <XModelAttribute name="last new version check" visibility="false" xmlname="LAST_NEW_VERSION_CHECK">
-    <Constraint/>
     <Editor name="Uneditable"/>
    </XModelAttribute>
    <XModelAttribute default="http://localhost:8880/"
-    name="browser prefix" xmlname="BROWSER_PREFIX">
-    <Constraint/>
-    <Editor/>
-   </XModelAttribute>
+    name="browser prefix" xmlname="BROWSER_PREFIX"/>
    <XModelAttribute default="http://uddi.microsoft.com/inquire"
-    name="uddi urls" visibility="false" xmlname="UDDI_URLS">
-    <Constraint/>
-    <Editor/>
-   </XModelAttribute>
+    name="uddi urls" visibility="false" xmlname="UDDI_URLS"/>
   </XModelAttributes>
   <XActionItem kind="list"/>
   <XDependencies/>
@@ -289,11 +302,9 @@
   </XEntityRenderer>
   <XModelAttributes>
    <XModelAttribute default="XStudio settings" loader="ElementType" name="element type">
-    <Constraint/>
     <Editor name="Uneditable"/>
    </XModelAttribute>
    <XModelAttribute default="XStudioSet" name="name" xmlname="NAME">
-    <Constraint/>
     <Editor name="Uneditable"/>
    </XModelAttribute>
    <XModelAttribute default="project" name="scope" visibility="false">
@@ -310,10 +321,7 @@
     </Constraint>
     <Editor name="ListAdd"/>
    </XModelAttribute>
-   <XModelAttribute name="body" visibility="false" xmlname="BODY">
-    <Constraint/>
-    <Editor/>
-   </XModelAttribute>
+   <XModelAttribute name="body" visibility="false" xmlname="BODY"/>
   </XModelAttributes>
   <XActionItem ICON="main.package" displayName="XStudioSet" group="1"
    kind="list" name="XStudioSetActions"/>

Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/Preference.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/Preference.java	2009-09-15 12:26:34 UTC (rev 17584)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/Preference.java	2009-09-15 12:58:14 UTC (rev 17585)
@@ -22,7 +22,7 @@
 	private String option;
 	private String attributeName;
 	public static final String OPTIONS_PATH = "%Options%"; //$NON-NLS-1$
-	public static String EDITOR_PATH = "%Options%/Struts Studio/Editors"; //$NON-NLS-1$
+	public static String EDITOR_PATH = "%Options%/Editors"; //$NON-NLS-1$
 	public static final Preference SHOW_NATURE_WARNING = new Preference(EDITOR_PATH, "natureWarning"); //$NON-NLS-1$
 	
 	protected Preference(String optionPath, String attributeName) {

More information about the jbosstools-commits mailing list