JBoss Tools SVN: r4326 - in trunk/common/plugins/org.jboss.tools.common.kb: schemas/tld and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2007-10-18 07:44:19 -0400 (Thu, 18 Oct 2007)
New Revision: 4326
Removed:
trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/ShaleClay.xml
trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/ShaleCore.xml
Modified:
trunk/common/plugins/org.jboss.tools.common.kb/plugin.xml
Log:
http://jira.jboss.com/jira/browse/JBIDE-1087
Modified: trunk/common/plugins/org.jboss.tools.common.kb/plugin.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.kb/plugin.xml 2007-10-18 11:42:54 UTC (rev 4325)
+++ trunk/common/plugins/org.jboss.tools.common.kb/plugin.xml 2007-10-18 11:44:19 UTC (rev 4326)
@@ -79,20 +79,8 @@
schema-location="schemas/tld/MyFacesTomahawk.xml"
uri="http://myfaces.apache.org/tomahawk"/>
-
<tld
jsf="true"
- name="Shale Core"
- schema-location="schemas/tld/ShaleCore.xml"
- uri="http://struts.apache.org/shale/core"/>
- <tld
- jsf="true"
- name="Shale Clay"
- schema-location="schemas/tld/ShaleClay.xml"
- uri="http://struts.apache.org/shale/clay-plugin"/>
-
- <tld
- jsf="true"
name="Facelets"
schema-location="schemas/tld/Facelets.xml"
uri="http://java.sun.com/jsf/facelets"/>
Deleted: trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/ShaleClay.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/ShaleClay.xml 2007-10-18 11:42:54 UTC (rev 4325)
+++ trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/ShaleClay.xml 2007-10-18 11:44:19 UTC (rev 4326)
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE kb-schema PUBLIC "-//Red Hat, Inc//DTD Knowledge Base 1.0//EN" "http://www.redhat.com/dtds/kb-schema_1_0.dtd">
-<schema location="" prefix="clay" uri="http://struts.apache.org/shale/clay-plugin">
- <element-type body-content="allowed" content="mixed" end-tag="required"
- name="clay" start-tag="required">
- <description/>
- <attribute-type name="id" required="true">
- <proposal type="beanProperty"/>
- <proposal type="jsfVariables"/>
- </attribute-type>
- <attribute type="id"/>
- <attribute-type name="jsfid" required="true">
- <proposal type="jsfID"/>
- </attribute-type>
- <attribute type="jsfid"/>
- <attribute-type name="managedBeanName" required="false">
- <proposal type="managedBeanName">
- <param name="bean-only" value="true"/>
- </proposal>
- </attribute-type>
- <attribute type="managedBeanName"/>
- <attribute-type name="shapeValidator" required="false">
- <proposal type="beanProperty"/>
- <proposal type="jsfVariables"/>
- </attribute-type>
- <attribute type="shapeValidator"/>
- <attribute-type name="rendered" required="false">
- <description>If false, this component will not be rendered.</description>
- <proposal type="beanProperty"/>
- <proposal type="jsfVariables"/>
- </attribute-type>
- <attribute type="rendered"/>
- </element-type>
- <element-type body-content="allowed" content="mixed" end-tag="required"
- name="symbol" start-tag="required">
- <description/>
- <attribute-type name="name" required="true">
- <proposal type="beanProperty"/>
- <proposal type="jsfVariables"/>
- </attribute-type>
- <attribute type="name"/>
- <attribute-type name="value" required="true">
- <proposal type="beanProperty"/>
- <proposal type="jsfVariables"/>
- </attribute-type>
- <attribute type="value"/>
- </element-type>
-</schema>
\ No newline at end of file
Deleted: trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/ShaleCore.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/ShaleCore.xml 2007-10-18 11:42:54 UTC (rev 4325)
+++ trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/ShaleCore.xml 2007-10-18 11:44:19 UTC (rev 4326)
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE kb-schema PUBLIC "-//Red Hat, Inc//DTD Knowledge Base 1.0//EN" "http://www.redhat.com/dtds/kb-schema_1_0.dtd">
-<schema location="" prefix="s" uri="http://struts.apache.org/shale/core">
- <element-type body-content="allowed" content="mixed" end-tag="required"
- name="subview" start-tag="required">
- <description>Provide ViewController support functionality for the nested content
- (typically a JSP dynamic include) of this component.</description>
- <attribute-type name="binding" required="false">
- <description>Value binding expression used to bind this component instance
- to a backing bean property.</description>
- <proposal type="beanProperty"/>
- <proposal type="jsfVariables"/>
- </attribute-type>
- <attribute type="binding"/>
- <attribute-type name="id" required="true">
- <description>Component identifier of this component. If specified, this identifier
- must be unique within the context of the closest parent UIComponent
- that is a NamingContainer.</description>
- <proposal type="beanProperty"/>
- <proposal type="jsfVariables"/>
- </attribute-type>
- <attribute type="id"/>
- <attribute-type name="rendered" required="false">
- <description>Flag indicating whether this component should be rendered.
- Default value is true.</description>
- <proposal type="beanProperty"/>
- <proposal type="jsfVariables"/>
- </attribute-type>
- <attribute type="rendered"/>
- </element-type>
- <element-type body-content="refused" content="mixed" end-tag="required"
- name="token" start-tag="required">
- <description>Render a hidden input field whose value is the transaction token
- for the containing form.</description>
- <attribute-type name="binding" required="false">
- <description>Value binding expression used to bind this component instance
- to a backing bean property.</description>
- <proposal type="beanProperty"/>
- <proposal type="jsfVariables"/>
- </attribute-type>
- <attribute type="binding"/>
- <attribute-type name="id" required="false">
- <description>Component identifier of this component. If specified, this identifier
- must be unique within the context of the closest parent UIComponent
- that is a NamingContainer.</description>
- <proposal type="beanProperty"/>
- <proposal type="jsfVariables"/>
- </attribute-type>
- <attribute type="id"/>
- <attribute-type name="rendered" required="false">
- <description>Flag indicating whether this component should be rendered.
- Default value is true.</description>
- <proposal type="beanProperty"/>
- <proposal type="jsfVariables"/>
- </attribute-type>
- <attribute type="rendered"/>
- </element-type>
- <element-type body-content="refused" content="mixed" end-tag="required"
- name="commonsValidator" start-tag="required">
- <description>Provides access to Commons Validators.</description>
- <attribute-type name="type" required="false">
- <description>The type of validator associated with this tag</description>
- <proposal type="beanProperty"/>
- <proposal type="jsfVariables"/>
- </attribute-type>
- <attribute type="type"/>
- <attribute-type name="min" required="false">
- <description>The minimum valid value</description>
- <proposal type="beanProperty"/>
- <proposal type="jsfVariables"/>
- </attribute-type>
- <attribute type="min"/>
- <attribute-type name="max" required="false">
- <description>The maximum valid value</description>
- <proposal type="beanProperty"/>
- <proposal type="jsfVariables"/>
- </attribute-type>
- <attribute type="max"/>
- <attribute-type name="minlength" required="false">
- <description>The minimum valid length of the field</description>
- <proposal type="beanProperty"/>
- <proposal type="jsfVariables"/>
- </attribute-type>
- <attribute type="minlength"/>
- <attribute-type name="maxlength" required="false">
- <description>The maximum valid length of the field</description>
- <proposal type="beanProperty"/>
- <proposal type="jsfVariables"/>
- </attribute-type>
- <attribute type="maxlength"/>
- <attribute-type name="mask" required="false">
- <description>A regular expression to which the value must conform</description>
- <proposal type="beanProperty"/>
- <proposal type="jsfVariables"/>
- </attribute-type>
- <attribute type="mask"/>
- <attribute-type name="datePatternStrict" required="false">
- <description>A date pattern using syntax defined in java.text.SimpleDateFormat</description>
- <proposal type="beanProperty"/>
- <proposal type="jsfVariables"/>
- </attribute-type>
- <attribute type="datePatternStrict"/>
- <attribute-type name="message" required="false">
- <description>A message displayed when validation fails</description>
- <proposal type="beanProperty"/>
- <proposal type="jsfVariables"/>
- </attribute-type>
- <attribute type="message"/>
- <attribute-type name="arg" required="false">
- <description>A value that's plugged into the message</description>
- <proposal type="beanProperty"/>
- <proposal type="jsfVariables"/>
- </attribute-type>
- <attribute type="arg"/>
- <attribute-type name="client" required="false">
- <description>If true, validation is performed on the client</description>
- <proposal type="beanProperty"/>
- <proposal type="jsfVariables"/>
- </attribute-type>
- <attribute type="client"/>
- <attribute-type name="server" required="false">
- <description>If true, validation is performed on the server</description>
- <proposal type="beanProperty"/>
- <proposal type="jsfVariables"/>
- </attribute-type>
- <attribute type="server"/>
- </element-type>
- <element-type body-content="refused" content="mixed" end-tag="required"
- name="validatorScript" start-tag="required">
- <description>Generates JavaScript for client-side validation</description>
- <attribute-type name="functionName" required="true">
- <description>The name of the function to generate.</description>
- <proposal type="beanProperty"/>
- <proposal type="jsfVariables"/>
- </attribute-type>
- <attribute type="functionName"/>
- </element-type>
-</schema>
17 years, 2 months
JBoss Tools SVN: r4323 - in trunk: jst/plugins/org.jboss.tools.jst.jsp and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-10-18 07:13:41 -0400 (Thu, 18 Oct 2007)
New Revision: 4323
Modified:
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui/xpl/UIMessages.properties
trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/messages/messages.properties
trunk/struts/plugins/org.jboss.tools.struts.ui/plugin.properties
Log:
JBIDE-645 and JBIDE-647 ...the last remaining red hat editors -> jboss tools editors
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui/xpl/UIMessages.properties
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui/xpl/UIMessages.properties 2007-10-18 10:57:26 UTC (rev 4322)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui/xpl/UIMessages.properties 2007-10-18 11:13:41 UTC (rev 4323)
@@ -11,5 +11,5 @@
# Red Hat, Inc.
# ******************************************************************************
-SelectionListenerWithSMManager.job.title=Red Hat Editors SM creation
+SelectionListenerWithSMManager.job.title=JBoss tools SM creation
RedHatStructuredTextEditor.markOccurrences.job.name
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties 2007-10-18 10:57:26 UTC (rev 4322)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties 2007-10-18 11:13:41 UTC (rev 4323)
@@ -1,7 +1,7 @@
providerName=Red Hat, Inc.
jsp.page.name=JSP Syntax Colors
-editors.jsp.name=Red Hat JSP Editor
-editors.html.name=Red Hat HTML Editor
+editors.jsp.name=JBoss Tools JSP Editor
+editors.html.name=JBoss Tools HTML Editor
JSP_Occurrences.name= JSP Occurrences
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/messages/messages.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/messages/messages.properties 2007-10-18 10:57:26 UTC (rev 4322)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/messages/messages.properties 2007-10-18 11:13:41 UTC (rev 4323)
@@ -144,7 +144,7 @@
CHANGE_TIME_STAMP=Change Time Stamp of
STOP_SERVER=Stop {0} Server
START_SERVER_IN_DEBUG_MODE=Start {0} Server in Debug Mode: {1}
-REDHAT_TAG_LIBRARY_EDITOR=Red Hat Tag Library Editor
+REDHAT_TAG_LIBRARY_EDITOR=JBoss Tools Tag Library Editor
SERVLET=Servlet
AUTH_CONSTRAINT=Auth Constraint
TAGLIBS=Taglibs
Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/plugin.properties
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.ui/plugin.properties 2007-10-18 10:57:26 UTC (rev 4322)
+++ trunk/struts/plugins/org.jboss.tools.struts.ui/plugin.properties 2007-10-18 11:13:41 UTC (rev 4323)
@@ -12,8 +12,8 @@
navigatorViewPart.name=Red Hat Projects
strutsProjectsViewPart.name=Struts Projects
-editors.tiles.name=Red Hat Studio Tiles Editor
-editors.strutsconfig.name=Red Hat Struts Flow Editor
+editors.tiles.name=JBoss Tools Tiles Editor
+editors.strutsconfig.name=JBoss Tools Struts Flow Editor
popupMenus.action.addStrutsNature=Add Struts Capabilities...
popupMenus.action.modulesConfiguration=Modules Configuration
17 years, 2 months
JBoss Tools SVN: r4322 - trunk/shale/plugins/org.jboss.tools.shale.ui/src/org/jboss/tools/shale/ui/clay/editor/action.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-10-18 06:57:26 -0400 (Thu, 18 Oct 2007)
New Revision: 4322
Modified:
trunk/shale/plugins/org.jboss.tools.shale.ui/src/org/jboss/tools/shale/ui/clay/editor/action/ClayMultiPageContributor.java
Log:
JBIDE-800
Modified: trunk/shale/plugins/org.jboss.tools.shale.ui/src/org/jboss/tools/shale/ui/clay/editor/action/ClayMultiPageContributor.java
===================================================================
--- trunk/shale/plugins/org.jboss.tools.shale.ui/src/org/jboss/tools/shale/ui/clay/editor/action/ClayMultiPageContributor.java 2007-10-18 10:38:32 UTC (rev 4321)
+++ trunk/shale/plugins/org.jboss.tools.shale.ui/src/org/jboss/tools/shale/ui/clay/editor/action/ClayMultiPageContributor.java 2007-10-18 10:57:26 UTC (rev 4322)
@@ -118,11 +118,10 @@
updateStatus();
}
- public static void registerKeyBindings(IHandlerService handler, String[] actions, ActionRegistry registry) {
+ public void registerKeyBindings(IHandlerService handler, String[] actions, ActionRegistry registry) {
for (int i = 0; i < actions.length; i++) {
IAction action = registry.getAction(actions[i]);
- if(action == null) continue;
- handler.activateHandler(actions[i], new ActionHandler(action));
+ registerKeyBinding(handler, actions[i], action);
}
}
17 years, 2 months
JBoss Tools SVN: r4321 - in trunk: common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/preferences and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-10-18 06:38:32 -0400 (Thu, 18 Oct 2007)
New Revision: 4321
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/preferences/preferences.properties
trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml
trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.properties
trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml
trunk/struts/plugins/org.jboss.tools.struts/resources/meta/strutsprojects.meta
Log:
JBIDE-645 and JBIDE-647 ...aligned preferences/view/wizards (used JBoss Tools Web category since merging where not possible at the moment)
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml 2007-10-18 10:28:51 UTC (rev 4320)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml 2007-10-18 10:38:32 UTC (rev 4321)
@@ -217,10 +217,11 @@
</actionSet>
</extension>
<extension point="org.eclipse.ui.preferencePages">
- <page
- class="org.jboss.tools.common.model.ui.preferences.CompanyPreferencesPage"
- id="org.jboss.tools.common.model.ui"
- name="JBoss Tools">
+ <page
+ category="org.jboss.ide.eclipse.ui.MainPreferencePage"
+ class="org.jboss.tools.common.model.ui.preferences.CompanyPreferencesPage"
+ id="org.jboss.tools.common.model.ui"
+ name="Web">
</page>
</extension>
<extension point="org.eclipse.ui.preferencePages">
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/preferences/preferences.properties
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/preferences/preferences.properties 2007-10-18 10:28:51 UTC (rev 4320)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/preferences/preferences.properties 2007-10-18 10:38:32 UTC (rev 4321)
@@ -3,4 +3,4 @@
AUTOMATION_PD=Here you can modify default text for the Tiles Struts plug-in element, the Validator Struts plug-in element, and error message resource files.
LIBRARY_SETS_PD=Here you can modify what libraries get included in the project file systems for new Struts projects. You can modify this specifically for different versions of the Servlet and Struts technologies that might be used with a project.
EDITORS_PD=Here you can control the behavior of the JBoss Tools JSP, XML, and Web Flow Configuration editors.
-REDHAT=Preferences for installed JBoss Tools.
\ No newline at end of file
+REDHAT=JBoss Tools Web preferences.
\ No newline at end of file
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2007-10-18 10:28:51 UTC (rev 4320)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2007-10-18 10:38:32 UTC (rev 4321)
@@ -60,7 +60,11 @@
</attributeEditor>
</extension>
- <extension point="org.eclipse.ui.newWizards">
+ <extension point="org.eclipse.ui.newWizards">
+ <category
+ name="JBoss Tools"
+ id="org.jboss.ide.eclipse.ui.wizards">
+ </category>
<category id="org.jboss.tools.jsf" name="JSF" parentCategory="org.jboss.tools.jst.web">
</category>
<wizard category="org.jboss.tools.jst.web/org.jboss.tools.jsf" class="org.jboss.tools.jsf.ui.wizard.newfile.NewFacesConfigFileWizard" icon="images/xstudio/wizards/jsf-config.gif" id="org.jboss.tools.jsf.ui.wizard.newfile.NewFacesConfigFileWizard" name="Faces Config" project="false">
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.properties 2007-10-18 10:28:51 UTC (rev 4320)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.properties 2007-10-18 10:38:32 UTC (rev 4321)
@@ -38,3 +38,5 @@
popupMenus.action.registerInServerXml=Register Web Context in server.xml
popupMenus.action.unregisterFromServerXml=Unregister Web Context from server.xml
popupMenus.action.saveAsTemplate=Save As Template...
+
+web.category_ui_=Web
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2007-10-18 10:28:51 UTC (rev 4320)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2007-10-18 10:38:32 UTC (rev 4321)
@@ -124,8 +124,10 @@
</editorType>
</extension>
- <extension point="org.eclipse.ui.newWizards">
- <category id="org.jboss.tools.jst.web" name="JBoss Tools">
+ <extension point="org.eclipse.ui.newWizards">
+ <category name="JBoss Tools Web"
+ parentCategory="org.eclipse.wst.web.ui"
+ id="org.jboss.tools.jst.web">
</category>
<wizard category="org.jboss.tools.jst.web" class="org.jboss.tools.jst.web.ui.wizards.newfile.NewCSSFileWizard" icon="images/xstudio/wizards/new_css_file.gif" id="org.jboss.tools.jst.web.ui.wizards.newfile.NewCSSFileWizard" name="CSS File" project="false">
<selection class="org.eclipse.core.resources.IResource">
@@ -167,7 +169,7 @@
</extension>
<extension id="org.jboss.tools.jst.web.ui.views" name="JBoss Tools" point="org.eclipse.ui.views">
- <category id="web.views.category.id" name="JBoss Tools">
+ <category id="web.views.category.id" name="JBoss Tools Web">
</category>
<view category="web.views.category.id" class="org.jboss.tools.common.model.ui.views.palette.PaletteViewPart" icon="images/xstudio/views/palette.gif" id="org.jboss.tools.common.model.ui.views.palette.PaletteView" name="%paletteViewPart.name">
</view>
Modified: trunk/struts/plugins/org.jboss.tools.struts/resources/meta/strutsprojects.meta
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/resources/meta/strutsprojects.meta 2007-10-18 10:28:51 UTC (rev 4320)
+++ trunk/struts/plugins/org.jboss.tools.struts/resources/meta/strutsprojects.meta 2007-10-18 10:38:32 UTC (rev 4321)
@@ -43,7 +43,7 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="Red Hat Developer Studio Struts"
+ <XActionItem ICON="action.empty" displayName="JBoss Tools Struts"
kind="list" name="StrutsStudio">
<XActionItem
HandlerClassName="org.jboss.tools.struts.model.pv.handler.StrutsProjectsRootRedirectHandler"
17 years, 2 months
JBoss Tools SVN: r4320 - trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/action.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-10-18 06:28:51 -0400 (Thu, 18 Oct 2007)
New Revision: 4320
Modified:
trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/action/StrutsMultiPageContributor.java
Log:
JBIDE-800
Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/action/StrutsMultiPageContributor.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/action/StrutsMultiPageContributor.java 2007-10-18 10:28:06 UTC (rev 4319)
+++ trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/action/StrutsMultiPageContributor.java 2007-10-18 10:28:51 UTC (rev 4320)
@@ -126,11 +126,10 @@
updateStatus();
}
- public static void registerKeyBindings(IHandlerService handler, String[] actions, ActionRegistry registry) {
+ public void registerKeyBindings(IHandlerService handler, String[] actions, ActionRegistry registry) {
for (int i = 0; i < actions.length; i++) {
IAction action = registry.getAction(actions[i]);
- if(action == null) continue;
- handler.activateHandler(actions[i], new ActionHandler(action));
+ registerKeyBinding(handler, actions[i], action);
}
}
17 years, 2 months
JBoss Tools SVN: r4319 - trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/action.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-10-18 06:28:06 -0400 (Thu, 18 Oct 2007)
New Revision: 4319
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/action/TilesMultiPageContributor.java
Log:
JBIDE-800
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/action/TilesMultiPageContributor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/action/TilesMultiPageContributor.java 2007-10-18 10:27:46 UTC (rev 4318)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/action/TilesMultiPageContributor.java 2007-10-18 10:28:06 UTC (rev 4319)
@@ -125,11 +125,11 @@
updateStatus();
}
- public static void registerKeyBindings(IHandlerService handler, String[] actions, ActionRegistry registry) {
+ public void registerKeyBindings(IHandlerService handler, String[] actions, ActionRegistry registry) {
for (int i = 0; i < actions.length; i++) {
IAction action = registry.getAction(actions[i]);
if(action == null) continue;
- handler.activateHandler(actions[i], new ActionHandler(action));
+ registerKeyBinding(handler, actions[i], action);
}
}
17 years, 2 months
JBoss Tools SVN: r4318 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-10-18 06:27:46 -0400 (Thu, 18 Oct 2007)
New Revision: 4318
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/JSFMultiPageContributor.java
Log:
JBIDE-800
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/JSFMultiPageContributor.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/JSFMultiPageContributor.java 2007-10-18 10:27:18 UTC (rev 4317)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/JSFMultiPageContributor.java 2007-10-18 10:27:46 UTC (rev 4318)
@@ -132,11 +132,10 @@
updateStatus();
}
- public static void registerKeyBindings(IHandlerService handler, String[] actions, ActionRegistry registry) {
+ public void registerKeyBindings(IHandlerService handler, String[] actions, ActionRegistry registry) {
for (int i = 0; i < actions.length; i++) {
IAction action = registry.getAction(actions[i]);
- if(action == null) continue;
- handler.activateHandler(actions[i], new ActionHandler(action));
+ registerKeyBinding(handler, actions[i], action);
}
}
17 years, 2 months
JBoss Tools SVN: r4317 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui: texteditors and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-10-18 06:27:18 -0400 (Thu, 18 Oct 2007)
New Revision: 4317
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/EditorPartWrapper.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/AbstractMultiPageContributor.java
Log:
JBIDE-800
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/EditorPartWrapper.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/EditorPartWrapper.java 2007-10-18 05:19:22 UTC (rev 4316)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/EditorPartWrapper.java 2007-10-18 10:27:18 UTC (rev 4317)
@@ -12,13 +12,21 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.util.ArrayList;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.jboss.tools.common.core.resources.XModelObjectEditorInput;
import org.jboss.tools.common.editor.NullEditorPart;
+import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
+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.IEditorInput;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IEditorSite;
@@ -26,12 +34,16 @@
import org.eclipse.ui.IReusableEditor;
import org.eclipse.ui.IWorkbenchPartSite;
import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.SubActionBars;
import org.eclipse.ui.internal.part.NullEditorInput;
import org.eclipse.ui.part.EditorPart;
+import org.eclipse.ui.part.IPageSite;
+import org.eclipse.ui.part.Page;
import org.eclipse.ui.part.WorkbenchPart;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
import org.jboss.tools.common.model.XModelObject;
-//import org.jboss.tools.common.text.xml.internal.ui.xmleditor.XmlEditor;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.text.ext.IEditorWrapper;
@@ -75,7 +87,7 @@
editor = new NullEditorPart();
editor.init(site, input);
setSite(site);
- setInput(input);
+ super.setInput(input);
return;
}
entity = computeEntity(input);
@@ -93,11 +105,52 @@
editor.init(site, input);
setSite(site);
editor.addPropertyListener(new PCL());
- setInput(input);
+ super.setInput(input);
}
-
- public void setInput(IEditorInput input) {
+
+ public void setInput(IEditorInput input) {
super.setInput(input);
+ if(editor != null) {
+ editor.dispose();
+ editor = null;
+ }
+ if(parent != null && !parent.isDisposed()) {
+ Control[] cs = parent.getChildren();
+ for (int i = 0; i < cs.length; i++) {
+ if(!cs[i].isDisposed()) cs[i].dispose();
+ }
+ }
+ try {
+ init((IEditorSite)getSite(), input);
+ } catch (PartInitException e) {
+ ModelUIPlugin.getPluginLog().logError(e);
+ return;
+ }
+ if(parent != null && !parent.isDisposed()) {
+ createPartControl(parent);
+ }
+ if(wrapper != null) {
+ IContentOutlinePage outline = (IContentOutlinePage)editor.getAdapter(IContentOutlinePage.class);
+ wrapper.setOutline(outline);
+ if(outline instanceof Page) {
+ ((SubActionBars)wrapper.getSite().getActionBars()).dispose();
+ ((Page)outline).init(wrapper.getSite());
+ wrapper.getSite().getActionBars().updateActionBars();
+ Control[] cs = wrapper.control.getChildren();
+ for (int i = 0; i < cs.length; i++) {
+ if(!cs[i].isDisposed()) cs[i].dispose();
+ }
+ outline.createControl(wrapper.control);
+ outline.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+ wrapper.control.update();
+ wrapper.control.layout();
+ wrapper.control.getParent().update();
+ wrapper.control.getParent().layout();
+ wrapper.control.getParent().getParent().update();
+ wrapper.control.getParent().getParent().layout();
+ ((SubActionBars)wrapper.getSite().getActionBars()).getToolBarManager().update(true);
+ }
+ }
}
static String DEFAULT_ENTITY = "xml";
@@ -117,8 +170,11 @@
super.addPropertyListener(l);
if(editor != null) editor.addPropertyListener(l);
}
+
+ Composite parent;
public void createPartControl(Composite parent) {
+ this.parent = parent;
if(editor != null) editor.createPartControl(parent);
parent.layout();
}
@@ -159,9 +215,22 @@
public void setFocus() {
if(editor != null) editor.setFocus();
}
-
+
+ COPWrapper wrapper = null;
+
public Object getAdapter(Class adapter) {
- return (editor == null) ? super.getAdapter(adapter) : editor.getAdapter(adapter);
+ if(editor == null) {
+ return super.getAdapter(adapter);
+ }
+ if(adapter != null && adapter.isAssignableFrom(IContentOutlinePage.class)) {
+ if(wrapper != null) return wrapper;
+ wrapper = new COPWrapper();
+ IContentOutlinePage outline = (IContentOutlinePage)editor.getAdapter(adapter);
+ wrapper.setOutline(outline);
+ return wrapper;
+ }
+
+ return editor.getAdapter(adapter);
}
public void doSave(IProgressMonitor monitor) {
@@ -195,10 +264,87 @@
class PCL implements IPropertyListener {
public void propertyChanged(Object source, int i) {
if(i == IEditorPart.PROP_INPUT && getEditorInput() != editor.getEditorInput()) {
- setInput(editor.getEditorInput());
+ EditorPartWrapper.super.setInput(editor.getEditorInput());
}
firePropertyChange(i);
}
}
}
+
+class COPWrapper extends ContentOutlinePage {
+ IContentOutlinePage outline;
+ Composite control;
+ private ArrayList<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
+
+ public COPWrapper() {}
+
+ public void addSelectionChangedListener(ISelectionChangedListener listener) {
+ selectionChangedListeners.add(listener);
+ if(outline != null) outline.addSelectionChangedListener(listener);
+ }
+
+ public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+ selectionChangedListeners.remove(listener);
+ if(outline != null) outline.removeSelectionChangedListener(listener);
+ }
+
+ public void setOutline(IContentOutlinePage outline) {
+ this.outline = outline;
+ if(outline != null) for (ISelectionChangedListener l: selectionChangedListeners) {
+ outline.addSelectionChangedListener(l);
+ }
+ }
+
+ public void init(IPageSite pageSite) {
+ super.init(pageSite);
+ if(outline instanceof Page) {
+ ((Page)outline).init(pageSite);
+ }
+ }
+
+ public Control getControl() {
+ return control;
+ }
+
+ public void createControl(Composite parent) {
+ control = new Composite(parent, SWT.NONE);
+ GridLayout layout = new GridLayout();
+ layout.marginWidth = 0;
+ control.setLayout(layout);
+ control.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+ if(outline != null) {
+ outline.createControl(control);
+ outline.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+ }
+ }
+
+ public ISelection getSelection() {
+ return outline != null ? outline.getSelection() : null;
+ }
+
+ public void selectionChanged(SelectionChangedEvent event) {
+ if(outline instanceof ContentOutlinePage) {
+ ((ContentOutlinePage)outline).selectionChanged(event);
+ }
+ }
+
+ public void setFocus() {
+ if(outline != null) outline.setFocus();
+ }
+
+ public void setSelection(ISelection selection) {
+ if(outline != null) outline.setSelection(selection);
+ }
+
+ public void dispose() {
+ if(outline != null) outline.dispose();
+ if(control != null) {
+ if(!control.isDisposed()) control.dispose();
+ control = null;
+ }
+ super.dispose();
+ }
+
+}
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/AbstractMultiPageContributor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/AbstractMultiPageContributor.java 2007-10-18 05:19:22 UTC (rev 4316)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/AbstractMultiPageContributor.java 2007-10-18 10:27:18 UTC (rev 4317)
@@ -18,6 +18,7 @@
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.*;
import org.eclipse.ui.*;
+import org.eclipse.ui.handlers.IHandlerActivation;
import org.eclipse.ui.handlers.IHandlerService;
import org.eclipse.ui.ide.IDEActionFactory;
import org.eclipse.ui.part.MultiPageEditorActionBarContributor;
@@ -220,19 +221,28 @@
};
Map<IAction, ActionHandler> used = new HashMap<IAction, ActionHandler>();
+ Map<String, IHandlerActivation> registered = new HashMap<String, IHandlerActivation>();
public void registerKeyBindings(IHandlerService handler, String[] actions, ITextEditor editor) {
for (int i = 0; i < actions.length; i++) {
IAction action = editor.getAction(actions[i]);
- if(action == null) continue;
- ActionHandler h = used.get(action);
- if(h == null) {
- h = new ActionHandler(action);
- used.put(action, h);
- }
- handler.activateHandler(actions[i], h);
+ registerKeyBinding(handler, actions[i], action);
}
}
+
+ protected void registerKeyBinding(IHandlerService handler, String command, IAction action) {
+ if(action == null) return;
+ ActionHandler h = used.get(action);
+ if(h == null) {
+ h = new ActionHandler(action);
+ used.put(action, h);
+ }
+ String id = action.getId();
+ IHandlerActivation c = registered.get(id);
+ if(c != null) handler.deactivateHandler(c);
+ IHandlerActivation a = handler.activateHandler(command, h);
+ if(a != null) registered.put(id, a);
+ }
protected class AFakeTextEditor implements ITextEditor, ITextOperationTarget {
protected HashMap<String,IAction> actions = new HashMap<String,IAction>();
17 years, 2 months