JBoss Tools SVN: r17826 - in trunk/as: plugins/org.jboss.ide.eclipse.archives.webtools and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-09-30 15:05:29 -0400 (Wed, 30 Sep 2009)
New Revision: 17826
Modified:
trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.core/build.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/build.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-3628 - Plug-ins should be .jar's not directories for efficiency sake.
as feature plug-ins converted to jars
Modified: trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml 2009-09-30 18:56:24 UTC (rev 17825)
+++ trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml 2009-09-30 19:05:29 UTC (rev 17826)
@@ -14,16 +14,16 @@
%copyright
</copyright>
- <license>Red Hat, Inc. licenses these features and plugins to you under
+ <license>
+ Red Hat, Inc. licenses these features and plugins to you under
certain open source licenses (or aggregations of such licenses), which
in a particular case may include the Eclipse Public License, the GNU
Lesser General Public License, and/or certain other open source
licenses. For precise licensing details, consult the corresponding
source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
Raleigh NC 27606 USA.
-</license>
+ </license>
-
<url>
<update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/>
</url>
@@ -89,13 +89,15 @@
id="org.jboss.ide.eclipse.as.core"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="0.0.0"
+ unpack="false"/>
<plugin
id="org.jboss.ide.eclipse.as.ui"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="0.0.0"
+ unpack="false"/>
<plugin
id="org.jboss.ide.eclipse.as.ui.mbeans"
@@ -122,7 +124,8 @@
id="org.jboss.ide.eclipse.archives.webtools"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="0.0.0"
+ unpack="false"/>
<plugin
id="org.jboss.ide.eclipse.as.wtp.core"
@@ -137,5 +140,5 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
</feature>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml 2009-09-30 18:56:24 UTC (rev 17825)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml 2009-09-30 19:05:29 UTC (rev 17826)
@@ -55,13 +55,13 @@
point="org.jboss.ide.eclipse.archives.ui.nodePopupMenus">
<nodeContribution
class="org.jboss.ide.eclipse.archives.webtools.ui.PublishAction"
- icon="icons/publish.gif"
+ icon="$nl$/icons/publish.gif"
id="org.jboss.ide.eclipse.as.ui.publishNodeContextContrib"
label="%nodeContribution.label.publishToServer"
weight="1"/>
<nodeContribution
class="org.jboss.ide.eclipse.archives.webtools.ui.EditPublishAction"
- icon="icons/publishDetails.gif "
+ icon="$nl$/icons/publishDetails.gif "
id="org.jboss.ide.eclipse.as.ui.modifyPublishNodeContextContrib"
label="%nodeContribution.label.editPublishSettings">
</nodeContribution>
@@ -70,17 +70,17 @@
point="org.jboss.ide.eclipse.archives.ui.newArchiveActions">
<newPackageAction
class="org.jboss.ide.eclipse.archives.webtools.ui.NewWARAction"
- icon="icons/war.gif"
+ icon="$nl$/icons/war.gif"
id="org.jboss.ide.eclipse.packages.ui.newWARAction"
label="%newPackageAction.label.war"/>
<newPackageAction
class="org.jboss.ide.eclipse.archives.webtools.ui.NewEJBJARAction"
- icon="icons/EJBJar.gif"
+ icon="$nl$/icons/EJBJar.gif"
id="org.jboss.ide.eclipse.packages.ui.newEJBJarAction"
label="%newPackageAction.label.ejbJar"/>
<newPackageAction
class="org.jboss.ide.eclipse.archives.webtools.ui.NewEARAction"
- icon="icons/ear.gif"
+ icon="$nl$/icons/ear.gif"
id="org.jboss.ide.eclipse.packages.ui.newEARAction"
label="%newPackageAction.label.ear"/>
</extension>
@@ -104,7 +104,7 @@
<navigatorContent
id="org.jboss.ide.eclipse.archives.webtools.ui.extensions.filesets"
activeByDefault="true"
- icon="icons/multiple_files.gif"
+ icon="$nl$/icons/multiple_files.gif"
contentProvider="org.jboss.ide.eclipse.archives.webtools.filesets.FilesetContentProvider"
labelProvider="org.jboss.ide.eclipse.archives.webtools.filesets.FilesetLabelProvider"
name="%NavigatorContent_Filesets"
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2009-09-30 18:56:24 UTC (rev 17825)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2009-09-30 19:05:29 UTC (rev 17826)
@@ -33,6 +33,7 @@
Bundle-ClassPath: dom4j-1.6.1.jar,
jaxen-1.1-beta-6.jar,
jbossascore.jar,
- getopt.jar
+ getopt.jar,
+ .
Bundle-Vendor: %Bundle-Vendor.0
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/build.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/build.properties 2009-09-30 18:56:24 UTC (rev 17825)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/build.properties 2009-09-30 19:05:29 UTC (rev 17826)
@@ -2,14 +2,16 @@
bin.includes = META-INF/,\
plugin.xml,\
License.txt,\
- jbossascore.jar,\
jaxen-1.1-beta-6.jar,\
dom4j-1.6.1.jar,\
plugin.properties,\
schema/,\
getopt.jar,\
properties/,\
- dtd/
-source.jbossascore.jar = jbosscore/
+ dtd/,\
+ .,\
+ about.html
additional.bundles = org.eclipse.wst.common.emfworkbench.integration,\
org.eclipse.jem.util
+source.. = jbosscore/
+jars.compile.order = .
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2009-09-30 18:56:24 UTC (rev 17825)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2009-09-30 19:05:29 UTC (rev 17826)
@@ -787,76 +787,76 @@
point="org.eclipse.wst.xml.core.catalogContributions">
<catalogContribution>
<public publicId="-//JBoss//DTD JBOSS 4.0//EN"
- uri="dtd/jboss_4_0.dtd"
+ uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss_4_0.dtd"
webURL="http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"/>
<public publicId="-//JBoss//DTD JBOSS 4.2//EN"
- uri="dtd/jboss_4_2.dtd"
+ uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss_4_2.dtd"
webURL="http://www.jboss.org/j2ee/dtd/jboss_4_2.dtd"/>
<public publicId="-//JBoss//DTD J2EE Application 1.4//EN"
- uri="dtd/jboss-app_4_0.dtd"
+ uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-app_4_0.dtd"
webURL="http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd"/>
<public publicId="-//JBoss//DTD J2EE Application 4.2//EN"
- uri="dtd/jboss-app_4_2.dtd"
+ uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-app_4_2.dtd"
webURL="http://www.jboss.org/j2ee/dtd/jboss-app_4_2.dtd"/>
<public publicId="-//JBoss//DTD Web Application 2.4//EN"
- uri="dtd/jboss-web_4_0.dtd"
+ uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-web_4_0.dtd"
webURL="http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"/>
<public publicId="-//JBoss//DTD Web Application 4.2//EN"
- uri="dtd/jboss-web_4_2.dtd"
+ uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-web_4_2.dtd"
webURL="http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"/>
<uri
name="http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"
- uri="dtd/jboss-ws-security_1_0.xsd"/>
+ uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-ws-security_1_0.xsd"/>
<uri
name="jaxws-config_2_0.xsd"
- uri="dtd/jaxws-config_2_0.xsd"/>
+ uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jaxws-config_2_0.xsd"/>
<public
publicId="-//JBoss//DTD JBOSS JCA Config 1.5//EN"
- uri="dtd/jboss-ds_1_5.dtd"
+ uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-ds_1_5.dtd"
webURL="http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd">
</public>
<public
publicId="-//JBoss//DTD MBean Service 4.2//EN"
- uri="dtd/jboss-service_4_2.dtd"
+ uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-service_4_2.dtd"
webURL="http://www.jboss.org/j2ee/dtd/jboss-service_4_2.dtd">
</public>
<public
publicId="-//JBoss//DTD Web Service Reference 4.2//EN"
- uri="dtd/service-ref_4_2.dtd"
+ uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/service-ref_4_2.dtd"
webURL="http://www.jboss.org/j2ee/dtd/service-ref_4_2.dtd">
</public>
<public
publicId="-//JBoss//DTD Java EE Application 5.0//EN"
- uri="dtd/jboss-app_5_0.dtd"
+ uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-app_5_0.dtd"
webURL="http://www.jboss.org/j2ee/dtd/jboss-app_5_0.dtd">
</public>
<public
publicId="-//JBoss//DTD JBOSS 5.0//EN"
- uri="dtd/jboss_5_0.dtd"
+ uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss_5_0.dtd"
webURL="http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd">
</public>
<public
publicId="-//JBoss//DTD Web Application 5.0//EN"
- uri="dtd/jboss-web_5_0.dtd"
+ uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-web_5_0.dtd"
webURL="http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd">
</public>
<public
publicId="-//JBoss//DTD JBOSS JCA Config 5.0//EN"
- uri="dtd/jboss-ds_5_0.dtd"
+ uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-ds_5_0.dtd"
webURL="http://www.jboss.org/j2ee/dtd/jboss-ds_5_0.dtd">
</public>
<public
publicId="-//JBoss//DTD MBean Service 5.0//EN"
- uri="dtd/jboss-service_5_0.dtd"
+ uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-service_5_0.dtd"
webURL="http://www.jboss.org/j2ee/dtd/jboss-service_5_0.dtd">
</public>
<public
publicId="-//JBoss//DTD Web Service Reference 5.0//EN"
- uri="dtd/service-ref_5_0.dtd"
+ uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/service-ref_5_0.dtd"
webURL="http://www.jboss.org/j2ee/dtd/service-ref_5_0.dtd">
</public>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2009-09-30 18:56:24 UTC (rev 17825)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2009-09-30 19:05:29 UTC (rev 17826)
@@ -53,7 +53,6 @@
org.jboss.ide.eclipse.as.ui.views.server.extensions,
org.jboss.ide.eclipse.as.ui.wizards,
org.jboss.tools.as.wst.server.ui.xpl
-Bundle-ClassPath: jbossui.jar
Bundle-Activator: org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin
Bundle-Vendor: %Bundle-Vendor.0
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/build.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/build.properties 2009-09-30 18:56:24 UTC (rev 17825)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/build.properties 2009-09-30 19:05:29 UTC (rev 17826)
@@ -1,7 +1,7 @@
-source.jbossui.jar = jbossui/
-output.jbossui.jar = bin/
+source.. = jbossui/
+output.. = bin/
bin.includes = META-INF/,\
- jbossui.jar,\
+ .,\
plugin.xml,\
plugin.properties,\
icons/,\
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2009-09-30 18:56:24 UTC (rev 17825)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2009-09-30 19:05:29 UTC (rev 17826)
@@ -8,20 +8,20 @@
<extension
point="org.eclipse.wst.server.ui.serverImages">
<image
- icon="icons/jboss.gif"
+ icon="$nl$/icons/jboss.gif"
typeIds="org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50"
id="org.jboss.ide.eclipse.as.ui.jbossIcon"/>
<image
- icon="icons/jboss.gif"
+ icon="$nl$/icons/jboss.gif"
typeIds="org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50"
id="org.jboss.ide.eclipse.as.ui.jbossIcon"/>
<image
- icon="icons/jboss.gif"
+ icon="$nl$/icons/jboss.gif"
typeIds="org.jboss.ide.eclipse.as.systemCopyServer"
id="org.jboss.ide.eclipse.as.ui.jbossIcon"/>
<image
- icon="icons/jboss.gif"
+ icon="$nl$/icons/jboss.gif"
typeIds="org.jboss.ide.eclipse.as.runtime.stripped"
id="org.jboss.ide.eclipse.as.ui.jbossIcon"/>
</extension>
@@ -66,11 +66,11 @@
<extension
point="org.eclipse.wst.server.ui.serverImages">
<image
- icon="icons/J2EEModule16.gif"
+ icon="$nl$/icons/J2EEModule16.gif"
id="org.jboss.ide.eclipse.as.ui.packagedProject.image"
typeIds="jboss.package"/>
<image
- icon="icons/file.gif"
+ icon="$nl$/icons/file.gif"
id="org.jboss.ide.eclipse.as.ui.simplefile.image"
typeIds="jboss.singlefile"/>
</extension>
@@ -113,7 +113,7 @@
point="org.eclipse.ui.perspectives">
<perspective
class="org.jboss.ide.eclipse.as.ui.perspective.ASPerspective"
- icon="icons/jboss.gif"
+ icon="$nl$/icons/jboss.gif"
id="org.jboss.ide.eclipse.as.ui.ASPerspective"
name="%perspective.name"/>
</extension>
@@ -189,13 +189,13 @@
point="org.eclipse.debug.ui.launchConfigurationTypeImages">
<launchConfigurationTypeImage
configTypeID="org.jboss.ide.eclipse.as.core.server.launchConfiguration"
- icon="icons/jboss.gif"
+ icon="$nl$/icons/jboss.gif"
id="org.jboss.ide.eclipse.as.ui.launchConfigurationImage1"/>
</extension>
<extension
point="org.eclipse.help.contexts">
- <contexts
+ <contexts
file="InlineDocs/Twiddle/twiddleContext.xml">
</contexts>
</extension>
@@ -209,7 +209,7 @@
<action
id="org.jboss.ide.eclipse.as.ui.popups.makeDeployable.action"
label="Make Publishable"
- icon="icons/publish.gif"
+ icon="$nl$/icons/publish.gif"
menubarPath="additions"
class="org.jboss.ide.eclipse.as.ui.actions.DeployAction">
</action>
@@ -243,15 +243,15 @@
<extension point="org.eclipse.ui.actionSets">
<actionSet description="%actionSets.serverActions.description" id="org.jboss.tools.jst.web.ui.server.actionSet" label="%actionSets.serverActions.label" visible="true">
- <action class="org.jboss.ide.eclipse.as.ui.actions.SelectServerActionDelegate" icon="icons/actions/xpl/server.gif" id="org.jboss.tools.jst.web.ui.action.server.SelectServerActionDelegate" label="label1" style="pulldown" toolbarPath="Normal/SelectServer" tooltip="%actionSets.serverActions.selectServer.label">
+ <action class="org.jboss.ide.eclipse.as.ui.actions.SelectServerActionDelegate" icon="$nl$/icons/actions/xpl/server.gif" id="org.jboss.tools.jst.web.ui.action.server.SelectServerActionDelegate" label="label1" style="pulldown" toolbarPath="Normal/SelectServer" tooltip="%actionSets.serverActions.selectServer.label">
</action>
- <action class="org.jboss.ide.eclipse.as.ui.actions.ChangeTimeStampActionDelegate" icon="icons/actions/webxml.gif" id="org.jboss.tools.jst.web.ui.action.server.ChangeTimeStampActionDelegate" label="label2" toolbarPath="Normal/server" tooltip="%actionSets.serverActions.changeWebXmlTimeStamp.label">
+ <action class="org.jboss.ide.eclipse.as.ui.actions.ChangeTimeStampActionDelegate" icon="$nl$/icons/actions/webxml.gif" id="org.jboss.tools.jst.web.ui.action.server.ChangeTimeStampActionDelegate" label="label2" toolbarPath="Normal/server" tooltip="%actionSets.serverActions.changeWebXmlTimeStamp.label">
</action>
- <action class="org.jboss.ide.eclipse.as.ui.actions.StopServerActionDelegate" icon="icons/actions/stop.gif" id="org.jboss.tools.jst.web.ui.action.server.StopServerActionDelegate" label="label4" toolbarPath="Normal/server" tooltip="%actionSets.serverActions.stopServer.label">
+ <action class="org.jboss.ide.eclipse.as.ui.actions.StopServerActionDelegate" icon="$nl$/icons/actions/stop.gif" id="org.jboss.tools.jst.web.ui.action.server.StopServerActionDelegate" label="label4" toolbarPath="Normal/server" tooltip="%actionSets.serverActions.stopServer.label">
</action>
- <action class="org.jboss.ide.eclipse.as.ui.actions.DebugServerActionDelegate" icon="icons/actions/xpl/debug.gif" id="org.jboss.tools.jst.web.ui.action.server.DebugServerActionDelegate" label="label6" toolbarPath="Normal/server" tooltip="%actionSets.serverActions.startServer.label">
+ <action class="org.jboss.ide.eclipse.as.ui.actions.DebugServerActionDelegate" icon="$nl$/icons/actions/xpl/debug.gif" id="org.jboss.tools.jst.web.ui.action.server.DebugServerActionDelegate" label="label6" toolbarPath="Normal/server" tooltip="%actionSets.serverActions.startServer.label">
</action>
- <action class="org.jboss.ide.eclipse.as.ui.actions.RunServerActionDelegate" icon="icons/actions/start.gif" id="org.jboss.tools.jst.web.ui.action.server.RunServerActionDelegate" label="label7" toolbarPath="Normal/server" tooltip="%actionSets.serverActions.startServer.label">
+ <action class="org.jboss.ide.eclipse.as.ui.actions.RunServerActionDelegate" icon="$nl$/icons/actions/start.gif" id="org.jboss.tools.jst.web.ui.action.server.RunServerActionDelegate" label="label7" toolbarPath="Normal/server" tooltip="%actionSets.serverActions.startServer.label">
</action>
</actionSet>
</extension>
@@ -275,11 +275,11 @@
name="%ViewName_JBossServerView"
category="org.eclipse.wst.server.ui"
class="org.jboss.tools.as.wst.server.ui.xpl.ServersView"
- icon="icons/jboss.gif"/>
+ icon="$nl$/icons/jboss.gif"/>
<view
category="org.eclipse.wst.server.ui"
class="org.jboss.ide.eclipse.as.ui.views.ServerLogView"
- icon="icons/console.gif"
+ icon="$nl$/icons/console.gif"
id="org.jboss.ide.eclipse.as.ui.view.serverLogView"
name="%ViewName_ServerLog"
restorable="true">
@@ -291,7 +291,7 @@
<navigatorContent
activeByDefault="true"
contentProvider="org.jboss.tools.as.wst.server.ui.xpl.ServerContentProvider"
- icon="icons/cview16/servers_view.gif"
+ icon="$nl$/icons/cview16/servers_view.gif"
id="org.jboss.tools.as.wst.server.ui.ServersView.content.root"
labelProvider="org.jboss.tools.as.wst.server.ui.xpl.ServerLabelProvider"
name="%NavigatorContent_ServersViewDefaultContent"
@@ -361,7 +361,7 @@
<navigatorContent
activeByDefault="true"
contentProvider="org.jboss.ide.eclipse.as.ui.views.server.extensions.XPathTreeContentProvider"
- icon="icons/XMLFile.gif"
+ icon="$nl$/icons/XMLFile.gif"
id="org.jboss.ide.eclipse.as.ui.extensions.xml"
labelProvider="org.jboss.ide.eclipse.as.ui.views.server.extensions.XPathTreeLabelProvider"
name="%NavigatorContent_XMLConfiguration"
@@ -428,7 +428,7 @@
<navigatorContent
activeByDefault="false"
contentProvider="org.jboss.ide.eclipse.as.ui.views.server.extensions.JMXProvider$ContentProvider"
- icon="icons/jmeth_obj.gif"
+ icon="$nl$/icons/jmeth_obj.gif"
id="org.jboss.ide.eclipse.as.ui.extensions.jmx"
labelProvider="org.jboss.ide.eclipse.as.ui.views.server.extensions.JMXProvider$LabelProvider"
name="%NavigatorContent_JMX"
@@ -522,7 +522,7 @@
<extension
point="org.jboss.tools.jmx.ui.providerUI">
<providerUI
- icon="icons/jboss.gif"
+ icon="$nl$/icons/jboss.gif"
id="org.jboss.ide.eclipse.as.core.extensions.jmx.JBossServerConnectionProvider"
name="JBoss Server">
</providerUI>
@@ -531,7 +531,7 @@
point="org.eclipse.debug.ui.launchConfigurationTypeImages">
<launchConfigurationTypeImage
configTypeID="org.jboss.ide.eclipse.as.core.server.startupConfiguration"
- icon="icons/jboss.gif"
+ icon="$nl$/icons/jboss.gif"
id="org.jboss.ide.eclipse.as.ui.launchConfigurationTypeImage1">
</launchConfigurationTypeImage>
</extension>
15 years, 2 months
JBoss Tools SVN: r17825 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2009-09-30 14:56:24 -0400 (Wed, 30 Sep 2009)
New Revision: 17825
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/SplitToolBar.java
Log:
issue JBIDE-4734: Layout for VPE tool bar formatting is broken under Linux.
https://jira.jboss.org/jira/browse/JBIDE-4734
- now if an ToolItem with a Combo intersects the bounds of the toolBar it is ensured that the combo is invisible.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/SplitToolBar.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/SplitToolBar.java 2009-09-30 18:26:08 UTC (rev 17824)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/SplitToolBar.java 2009-09-30 18:56:24 UTC (rev 17825)
@@ -30,6 +30,7 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.CoolBar;
import org.eclipse.swt.widgets.CoolItem;
+import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.ToolBar;
@@ -51,7 +52,7 @@
public abstract void createItems(ToolBar bar);
public void createToolBarControl(Composite parent) {
- final Composite comp = new Composite(parent, SWT.NONE);
+ Composite comp = new Composite(parent, SWT.NONE);
comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
comp.setLayout(new GridLayout());
coolBar = new CoolBar(comp, SWT.FLAT | SWT.WRAP);
@@ -59,7 +60,7 @@
final ToolBar toolBar = new ToolBar(coolBar, SWT.FLAT | SWT.WRAP);
createItems(toolBar);
- CoolItem coolItem = new CoolItem(coolBar, SWT.DROP_DOWN);
+ final CoolItem coolItem = new CoolItem(coolBar, SWT.DROP_DOWN);
coolItem.setControl(toolBar);
Point size = toolBar.computeSize(SWT.DEFAULT, SWT.DEFAULT);
Point coolSize = coolItem.computeSize(size.x, size.y);
@@ -68,89 +69,11 @@
coolItem.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent event) {
if (event.detail == SWT.ARROW) {
- CoolItem coolItem = (CoolItem) event.widget;
- ToolBar bar = (ToolBar) coolItem.getControl();
- ToolItem[] tools = bar.getItems();
- Rectangle itemBounds = bar.getBounds();
- Point pt = coolBar.toDisplay(new Point(itemBounds.x,
- itemBounds.y));
- itemBounds.x = pt.x;
- itemBounds.y = pt.y;
+ int shownItemsCount = getShownItemsCount(toolBar);
+ final Shell floatingShell
+ = createFloatingShell(toolBar, shownItemsCount);
- int i = 0;
- while (i < tools.length) {
- Rectangle toolBounds = tools[i].getBounds();
- pt = bar.toDisplay(new Point(toolBounds.x, toolBounds.y));
- toolBounds.x = pt.x;
- toolBounds.y = pt.y;
-
- /*
- * Figure out the visible portion of the tool by looking
- * at the intersection of the tool bounds with the cool
- * item bounds.
- */
- Rectangle intersection = itemBounds
- .intersection(toolBounds);
-
- /*
- * If the tool is not completely within the cool item
- * bounds, then it is partially hidden, and all
- * remaining tools are completely hidden.
- */
- if (!intersection.equals(toolBounds)) {
- break;
- }
- i++;
- }
-
- /*
- * Create a menu with items for each of the completely
- * hidden buttons.
- */
- final Shell floatingShell = new Shell(coolBar.getShell(),
- SWT.ON_TOP);
- FillLayout shellLayout = new FillLayout(SWT.VERTICAL);
- shellLayout.marginHeight = 5;
- shellLayout.marginWidth = 5;
- shellLayout.spacing = 5;
-
- floatingShell.setLayout(shellLayout);
- SelectionListener selectionListener = new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- floatingShell.dispose();
- }
- };
-
- ToolBar floatingBar = null;
- for (int j = i; j < tools.length; j++) {
- ToolItem tool = tools[j];
- int style = tool.getStyle();
-
- if ((style & SWT.SEPARATOR) != 0) {
- Control control = tool.getControl();
- if (control instanceof Combo) {
- cloneCombo(floatingShell, selectionListener,
- (Combo) control);
- }
- } else {
- if (floatingBar == null) {
- floatingBar = new ToolBar(floatingShell,
- SWT.FLAT | SWT.WRAP);
- }
- cloneItem(floatingBar, tool, selectionListener);
- }
- }
-// Point size = floatingBar.computeSize (300, SWT.DEFAULT);
-// System.out.println(size);
-// floatingBar.setSize (size);
-// floatingBar.pack();
- floatingShell.pack();
-
- /*
- * Drop down the menu below the chevron, with the left edges
- * aligned.
- */
- pt = coolBar.toDisplay(new Point(event.x, event.y));
+ Point pt = coolBar.toDisplay(new Point(event.x, event.y));
arrange(floatingShell, pt);
floatingShell.setVisible(true);
floatingShell.setFocus();
@@ -162,6 +85,13 @@
}
}
});
+ toolBar.addListener(SWT.Resize, new Listener() {
+ public void handleEvent(Event event) {
+ int shownItemsCount = getShownItemsCount(toolBar);
+ ensureVisibility(shownItemsCount, toolBar);
+ }
+ });
+
coolBar.pack();
// coolBar.layout();
@@ -281,7 +211,6 @@
Arrays.asList(combo.getItems()),
combo.getSelectionIndex());
copiedCombo.setEnabled(combo.getEnabled());
- copiedCombo.setVisible(combo.getVisible());
copySelectionListeners(combo, copiedCombo);
copiedCombo.addSelectionListener(selectionListener);
}
@@ -367,4 +296,106 @@
return result;
}
+
+ /**
+ * Ensures that the first {@code shownItemsCount} items of
+ * the given {@code toolBar} are shown and the rest are hidden.
+ *
+ * Also see JBIDE-4734 (screenshot-2.jpeg).
+ */
+ private void ensureVisibility(int shownItemsCount,
+ ToolBar toolBar) {
+ int toolItemCount = toolBar.getItemCount();
+ for (int i = 0; i < toolItemCount; i++) {
+ ToolItem toolItem = toolBar.getItem(i);
+ Control control = toolItem.getControl();
+ if (control != null) {
+ control.setVisible(i < shownItemsCount);
+ }
+ }
+ }
+
+ /**
+ * Creates a floating toolbar with copy of items from
+ * {@code fixedToolBar} beginning from {@code firstItemIndex}.
+ */
+ private Shell createFloatingShell(ToolBar fixedToolBar,
+ int firstItemIndex) {
+ final Shell floatingShell = new Shell(coolBar.getShell(),
+ SWT.ON_TOP);
+ FillLayout shellLayout = new FillLayout(SWT.VERTICAL);
+ shellLayout.marginHeight = 5;
+ shellLayout.marginWidth = 5;
+ shellLayout.spacing = 5;
+ floatingShell.setLayout(shellLayout);
+ SelectionListener selectionListener = new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ floatingShell.dispose();
+ }
+ };
+
+ ToolBar buttonsBar = null;
+ ToolItem[] tools = fixedToolBar.getItems();
+ for (int j = firstItemIndex; j < tools.length; j++) {
+ ToolItem tool = tools[j];
+ int style = tool.getStyle();
+
+ if ((style & SWT.SEPARATOR) != 0) {
+ Control control = tool.getControl();
+ if (control instanceof Combo) {
+ cloneCombo(floatingShell, selectionListener,
+ (Combo) control);
+ }
+ } else {
+ if (buttonsBar == null) {
+ buttonsBar = new ToolBar(floatingShell,
+ SWT.FLAT | SWT.WRAP);
+ }
+ cloneItem(buttonsBar, tool, selectionListener);
+ }
+ }
+
+ floatingShell.pack();
+
+ return floatingShell;
+ }
+
+ /**
+ * Returns the number of shown items in the {@code toolBar}.
+ */
+ private int getShownItemsCount(ToolBar bar) {
+ Rectangle barBounds = bar.getBounds();
+ Point pt = coolBar.toDisplay(new Point(barBounds.x,
+ barBounds.y));
+ barBounds.x = pt.x;
+ barBounds.y = pt.y;
+
+ ToolItem[] tools = bar.getItems();
+ int i = 0;
+ while (i < tools.length) {
+ Rectangle toolBounds = tools[i].getBounds();
+ pt = bar.toDisplay(new Point(toolBounds.x, toolBounds.y));
+ toolBounds.x = pt.x;
+ toolBounds.y = pt.y;
+
+ /*
+ * Figure out the visible portion of the tool by looking
+ * at the intersection of the tool bounds with the toolbar
+ * bounds.
+ */
+ Rectangle intersection = barBounds
+ .intersection(toolBounds);
+
+ /*
+ * If the tool is not completely within the toolbar
+ * bounds, then it is partially hidden, and all
+ * remaining tools are completely hidden.
+ */
+ if (!intersection.equals(toolBounds)) {
+ break;
+ }
+ i++;
+ }
+ return i;
+ }
}
15 years, 2 months
JBoss Tools SVN: r17824 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-09-30 14:26:08 -0400 (Wed, 30 Sep 2009)
New Revision: 17824
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/TwiddleDialog.java
Log:
Code clean up for TwiddleDialog
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/TwiddleDialog.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/TwiddleDialog.java 2009-09-30 17:28:32 UTC (rev 17823)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/TwiddleDialog.java 2009-09-30 18:26:08 UTC (rev 17824)
@@ -39,7 +39,7 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.internal.Workbench;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.server.internal.launch.TwiddleLaunchConfiguration;
import org.jboss.ide.eclipse.as.core.server.internal.launch.TwiddleLauncher;
@@ -149,7 +149,7 @@
queryLabelData.top = new FormAttachment(0,5);
queryLabel.setLayoutData(queryLabelData);
- Workbench.getInstance().getHelpSystem().setHelp(getShell(),
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(getShell(),
"org.jboss.ide.eclipse.as.ui.twiddle_usage_tutorial_help"); //$NON-NLS-1$
query = new Text(main, SWT.BORDER);
15 years, 2 months
JBoss Tools SVN: r17823 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2009-09-30 13:28:32 -0400 (Wed, 30 Sep 2009)
New Revision: 17823
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/SplitToolBar.java
Log:
issue JBIDE-4734: Layout for VPE tool bar formatting is broken under Linux.
https://jira.jboss.org/jira/browse/JBIDE-4734
- now all hidden buttons are accessible from chevron-menu
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/SplitToolBar.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/SplitToolBar.java 2009-09-30 17:06:27 UTC (rev 17822)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/SplitToolBar.java 2009-09-30 17:28:32 UTC (rev 17823)
@@ -68,14 +68,14 @@
coolItem.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent event) {
if (event.detail == SWT.ARROW) {
- CoolItem item = (CoolItem) event.widget;
- Rectangle itemBounds = item.getBounds();
+ CoolItem coolItem = (CoolItem) event.widget;
+ ToolBar bar = (ToolBar) coolItem.getControl();
+ ToolItem[] tools = bar.getItems();
+ Rectangle itemBounds = bar.getBounds();
Point pt = coolBar.toDisplay(new Point(itemBounds.x,
itemBounds.y));
itemBounds.x = pt.x;
itemBounds.y = pt.y;
- ToolBar bar = (ToolBar) item.getControl();
- ToolItem[] tools = bar.getItems();
int i = 0;
while (i < tools.length) {
@@ -368,4 +368,3 @@
return result;
}
}
-
15 years, 2 months
JBoss Tools SVN: r17822 - in trunk/common/plugins/org.jboss.tools.common.model: resources/meta and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-09-30 13:06:27 -0400 (Wed, 30 Sep 2009)
New Revision: 17822
Removed:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/StopProcessHandler.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/XProcessStorage.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/Messages.java
Modified:
trunk/common/plugins/org.jboss.tools.common.model/plugin.xml
trunk/common/plugins/org.jboss.tools.common.model/resources/meta/ant.meta
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithExternalHandler.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelUtil.java
Log:
Dead code removed
Modified: trunk/common/plugins/org.jboss.tools.common.model/plugin.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/plugin.xml 2009-09-30 17:05:14 UTC (rev 17821)
+++ trunk/common/plugins/org.jboss.tools.common.model/plugin.xml 2009-09-30 17:06:27 UTC (rev 17822)
@@ -127,8 +127,6 @@
class="org.jboss.tools.common.meta.help.HelpHandler"/>
<xclass id="org.jboss.tools.common.model.engines.impl.EnginesLoader"
class="org.jboss.tools.common.model.engines.impl.EnginesLoader"/>
- <xclass id="org.jboss.tools.common.model.engines.impl.StopProcessHandler"
- class="org.jboss.tools.common.model.engines.impl.StopProcessHandler"/>
<xclass id="org.jboss.tools.common.model.files.handlers.InvokingWizardHandler"
class="org.jboss.tools.common.model.files.handlers.InvokingWizardHandler"/>
<xclass id="org.jboss.tools.common.model.filesystems.impl.CreateFileHandler"
Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/ant.meta
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/ant.meta 2009-09-30 17:05:14 UTC (rev 17821)
+++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/ant.meta 2009-09-30 17:06:27 UTC (rev 17822)
@@ -89,9 +89,6 @@
<XActionItem
HandlerClassName="org.jboss.tools.common.model.handlers.RunAntHandler"
ICON="action.start" displayName="Run Ant..." kind="action" name="Run"/>
- <XActionItem HIDE="disabled"
- HandlerClassName="org.jboss.tools.common.model.engines.impl.StopProcessHandler"
- ICON="action.stop" displayName="Stop" kind="action" name="Stop"/>
</XActionItem>
<XActionItem ICON="action.empty" kind="list" name="Properties">
<XActionItem HandlerClassName="%Properties%" ICON="action.empty"
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithExternalHandler.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithExternalHandler.java 2009-09-30 17:05:14 UTC (rev 17821)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/OpenWithExternalHandler.java 2009-09-30 17:06:27 UTC (rev 17822)
@@ -84,12 +84,6 @@
if(OpenWithHelper.validatePath(actionname, editor)) new OWEProcess(editor, filename).start();
}
- public static void startExplorer(XModel model, String url) throws XModelException {
- XModelObject editor = model.getByPath("%Options%/External Programs/Internet Browser"); //$NON-NLS-1$
- if(editor == null) throw new XModelException("External Program 'Internet Browser' is not set in Options.");
- if(OpenWithHelper.validatePath("Open", editor)) new OWEProcess(editor, url, true).start(); //$NON-NLS-1$
- }
-
}
class OWEProcess extends XProcess {
Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/StopProcessHandler.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/StopProcessHandler.java 2009-09-30 17:05:14 UTC (rev 17821)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/StopProcessHandler.java 2009-09-30 17:06:27 UTC (rev 17822)
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.common.model.engines.impl;
-
-import java.text.MessageFormat;
-import java.util.*;
-import org.jboss.tools.common.model.*;
-import org.jboss.tools.common.model.util.*;
-import org.jboss.tools.common.meta.action.impl.*;
-
-public class StopProcessHandler extends AbstractHandler {
-
- public StopProcessHandler() {}
-
- public boolean isEnabled(XModelObject object) {
- if(object == null) return false;
- return (object != null && XProcessStorage.getDefaultStorage().getRunningInstances(object.getPath()) != null);
- }
-
- public void executeHandler(XModelObject object, Properties p) throws XModelException {
- if(!isEnabled(object)) return;
- String path = object.getPath();
- XProcessStorage s = XProcessStorage.getDefaultStorage();
- HashMap<Long,XProcess> map = s.getRunningInstances(path);
- Long[] ls = map.keySet().toArray(new Long[0]);
- for (int i = 0; i < ls.length; i++) {
- s.stopInstance(path, ls[i].longValue());
- object.getModel().getOut().println(MessageFormat.format("Process executing {0} ({1}) stopped.",
- FindObjectHelper.makeRef(object), new Date(ls[i].longValue())));
- }
- }
-
-}
Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/XProcessStorage.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/XProcessStorage.java 2009-09-30 17:05:14 UTC (rev 17821)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/XProcessStorage.java 2009-09-30 17:06:27 UTC (rev 17822)
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.common.model.engines.impl;
-
-import java.util.*;
-
-public class XProcessStorage {
- private static XProcessStorage storage = new XProcessStorage();
-
- public static XProcessStorage getDefaultStorage() {
- return storage;
- }
-
- private HashMap<String,HashMap<Long,XProcess>> objects = new HashMap<String,HashMap<Long,XProcess>>();
-
- public XProcessStorage() {}
-
- public void addInstance(String path, XProcess p) {
- if(p == null || !p.isRunning()) return;
- getInstances(path).put(Long.valueOf(System.currentTimeMillis()), p);
- }
-
- private HashMap<Long,XProcess> getInstances(String path) {
- HashMap<Long,XProcess> is = objects.get(path);
- if(is == null) {
- is = new HashMap<Long,XProcess>();
- objects.put(path, is);
- }
- return is;
- }
-
- public HashMap<Long,XProcess> getRunningInstances(String path) {
- HashMap<Long,XProcess> is = objects.get(path);
- if(is == null) return null;
- validate(is);
- return (is.size() == 0) ? null : is;
- }
-
- private void validate(HashMap<Long,XProcess> is) {
- Iterator ks = is.keySet().iterator();
- while(ks.hasNext()) {
- Object k = ks.next();
- XProcess p = is.get(k);
- if(!p.isRunning()) ks.remove();
- }
- }
-
- public void stopInstance(String path, long time) {
- HashMap<Long,XProcess> is = getRunningInstances(path);
- if(is == null) return;
- Long l = Long.valueOf(time);
- XProcess p = is.get(l);
- if(p == null) return;
- p.stop();
- is.remove(l);
- }
-
-}
Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/Messages.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/Messages.java 2009-09-30 17:05:14 UTC (rev 17821)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/Messages.java 2009-09-30 17:06:27 UTC (rev 17822)
@@ -1,22 +0,0 @@
-package org.jboss.tools.common.model.util;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
- private static final String BUNDLE_NAME = "org.jboss.tools.common.model.util.XBundle"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
- .getBundle(BUNDLE_NAME);
-
- private Messages() {
- }
-
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
- }
-}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelUtil.java 2009-09-30 17:05:14 UTC (rev 17821)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelUtil.java 2009-09-30 17:06:27 UTC (rev 17822)
@@ -14,31 +14,11 @@
import org.jboss.tools.common.meta.action.XActionInvoker;
import org.jboss.tools.common.model.*;
-import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
-import org.jboss.tools.common.model.impl.*;
public class XModelUtil {
- private static final String DEFAULT_MODEL_VERSION = "5.0"; //$NON-NLS-1$
-
private static final String PROPERTIES_ACTION = "Properties/Properties"; //$NON-NLS-1$
private static final String EDIT_ACTION = "Edit"; //$NON-NLS-1$
- public static void addModifyListener(XModel model, Object listener) {
- RootImpl impl = (RootImpl)model.getRoot();
- impl.addModifyListener(listener);
- }
-
- public static void addHistoryListener(XModel model, Object listener) {
- model.getUndoManager().addListener(listener);
- }
-
- public static String getModelVersion(XModel model) {
- XModelObject fss = FileSystemsHelper.getFileSystems(model);
- if(fss == null) return DEFAULT_MODEL_VERSION;
- String modelVersionStr = fss.getAttributeValue(XModelConstants.MODEL_VERSION);
- return (modelVersionStr == null || "".equals(modelVersionStr)) ? DEFAULT_MODEL_VERSION : modelVersionStr; //$NON-NLS-1$
- }
-
public static void openProperyDialog(XModelObject object){
XActionInvoker.invoke(PROPERTIES_ACTION, object, new Properties());
}
15 years, 2 months
JBoss Tools SVN: r17821 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-09-30 13:05:14 -0400 (Wed, 30 Sep 2009)
New Revision: 17821
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4771
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java 2009-09-30 15:10:15 UTC (rev 17820)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java 2009-09-30 17:05:14 UTC (rev 17821)
@@ -23,6 +23,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.search.IJavaSearchScope;
import org.eclipse.jdt.internal.ui.text.FastJavaPartitionScanner;
import org.eclipse.jdt.ui.text.IJavaPartitions;
@@ -57,6 +58,7 @@
import org.jboss.tools.common.el.core.resolver.JavaMemberELSegment;
import org.jboss.tools.common.el.core.resolver.SimpleELContext;
import org.jboss.tools.common.el.core.resolver.Var;
+import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.seam.core.SeamCorePlugin;
@@ -280,7 +282,7 @@
ELInvocationExpression expression = findComponentReference(ie);
if(expression != null){
ELInvocationExpression left = expression.getLeft();
- checkMatch(file, expression, offset+getOffset(left), offset+getOffset(expression), getLength(expression));
+ checkMatch(file, left, offset+getOffset(left), offset+getOffset(expression), getLength(expression));
}
}
}
@@ -409,12 +411,13 @@
return false;
}
- private void resolve(IFile file, ELExpression operand, int leftOffset, int offset, int length){
- //System.out.println("resolve file - "+file.getFullPath()+" leftOffset - "+leftOffset+" offset - "+offset);
- ELResolver[] resolvers = ELResolverFactoryManager.getInstance().getResolvers(file);
+ private void resolve(IFile file, ELExpression operand, int leftOffset,
+ int offset, int length) {
+ ELResolver[] resolvers = ELResolverFactoryManager.getInstance()
+ .getResolvers(file);
- for(ELResolver resolver : resolvers){
- if(!(resolver instanceof ELCompletionEngine))
+ for (ELResolver resolver : resolvers) {
+ if (!(resolver instanceof ELCompletionEngine))
continue;
SimpleELContext context = new SimpleELContext();
@@ -422,7 +425,8 @@
context.setResource(file);
context.setElResolvers(resolvers);
- List<Var> vars = ElVarSearcher.findAllVars(context, leftOffset, resolver);
+ List<Var> vars = ElVarSearcher.findAllVars(context, leftOffset,
+ resolver);
context.setVars(vars);
@@ -430,10 +434,19 @@
ELSegment segment = resolution.findSegmentByOffset(leftOffset);
- if(segment != null && segment instanceof JavaMemberELSegment && segment.isResolved()) {
- JavaMemberELSegment javaSegment = (JavaMemberELSegment)segment;
+ if (segment != null && segment instanceof JavaMemberELSegment
+ && segment.isResolved()) {
+ JavaMemberELSegment javaSegment = (JavaMemberELSegment) segment;
IJavaElement segmentJavaElement = javaSegment.getJavaElement();
- if(javaElement.equals(segmentJavaElement))
+ if (javaElement instanceof IType
+ && segmentJavaElement instanceof IType) {
+ if (EclipseJavaUtil.isDerivedClass(
+ ((IType) segmentJavaElement)
+ .getFullyQualifiedName(),
+ ((IType) javaElement).getFullyQualifiedName(), file
+ .getProject()))
+ ;
+ } else if (javaElement.equals(segmentJavaElement))
match(file, offset, length);
}
}
15 years, 2 months
JBoss Tools SVN: r17820 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-09-30 11:10:15 -0400 (Wed, 30 Sep 2009)
New Revision: 17820
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4771
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java 2009-09-30 13:43:49 UTC (rev 17819)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java 2009-09-30 15:10:15 UTC (rev 17820)
@@ -342,7 +342,7 @@
ELInvocationExpression expr = (ELInvocationExpression)ex;
try {
ELResolution resolution = engine.resolveEL(null, expr, false);
- if(resolution.isResolved()) {
+ if(resolution != null && resolution.isResolved()) {
ELSegment segment = resolution.getLastSegment();
if(segment instanceof JavaMemberELSegmentImpl) {
member = ((JavaMemberELSegmentImpl)segment).getMemberInfo();
15 years, 2 months
JBoss Tools SVN: r17819 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-09-30 09:43:49 -0400 (Wed, 30 Sep 2009)
New Revision: 17819
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4934
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java 2009-09-30 13:42:53 UTC (rev 17818)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java 2009-09-30 13:43:49 UTC (rev 17819)
@@ -16,12 +16,11 @@
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.jst.web.model.helpers.WebAppHelper;
+import org.jboss.tools.jst.web.tld.model.TLDUtil;
public class JSFProjectTagLibs extends JSFProjectResourceBundles {
private static final long serialVersionUID = 7805053632320764494L;
- static String FILE_FACELET_TAGLIB = "FileFaceletTaglib";
-
protected Iterator<XModelObject> getRoots() {
List<XModelObject> list = new ArrayList<XModelObject>();
XModelObject r = getModel().getByPath("FileSystems/WEB-INF");
@@ -48,13 +47,16 @@
}
Iterator<XModelObject> it = list.iterator();
- Set<String> set = new HashSet<String>();
+ Set<String> tlds = new HashSet<String>();
+ Set<String> facelets = new HashSet<String>();
while(it.hasNext()) {
XModelObject o = it.next();
String uri = o.getAttributeValue("uri");
- if(uri != null && uri.length() == 0 && isFaceletTaglibFile(o)) {
+ boolean isFacelet = TLDUtil.isFaceletTaglib(o);
+ if(uri != null && uri.length() == 0 && isFacelet) {
uri = o.getAttributeValue("library-class");
}
+ Set<String> set = isFacelet ? facelets : tlds;
if(set.contains(uri)) {
it.remove();
} else {
@@ -87,7 +89,7 @@
protected boolean acceptFile(XModelObject o) {
if("META-INF".equals(o.getParent().getAttributeValue("name"))) {
- if(isFaceletTaglibFile(o)) return true;
+ if(TLDUtil.isFaceletTaglib(o)) return true;
}
return isTLDFile(o);
}
@@ -97,11 +99,6 @@
return TLD_ENTITIES.indexOf(entity) >= 0;
}
- public static boolean isFaceletTaglibFile(XModelObject o) {
- String entity = o.getModelEntity().getName();
- return entity.startsWith(FILE_FACELET_TAGLIB);
- }
-
public Object getAdapter(Class adapter) {
if(adapter == IResource.class) {
XModelObject o = getModel().getByPath("FileSystems/WEB-INF");
15 years, 2 months
JBoss Tools SVN: r17818 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/navigator.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-09-30 09:42:53 -0400 (Wed, 30 Sep 2009)
New Revision: 17818
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/navigator/JsfProjectsTreeListener.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4934
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/navigator/JsfProjectsTreeListener.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/navigator/JsfProjectsTreeListener.java 2009-09-30 13:23:51 UTC (rev 17817)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/navigator/JsfProjectsTreeListener.java 2009-09-30 13:42:53 UTC (rev 17818)
@@ -19,6 +19,7 @@
import org.jboss.tools.jsf.model.pv.JSFProjectTagLibs;
import org.jboss.tools.jsf.model.pv.JSFProjectsRoot;
import org.jboss.tools.jst.web.model.pv.WebProjectNode;
+import org.jboss.tools.jst.web.tld.model.TLDUtil;
public class JsfProjectsTreeListener extends TreeViewerModelListenerImpl {
@@ -65,7 +66,7 @@
String entity = c.getModelEntity().getName();
if("FilePROPERTIES".equals(c.getModelEntity().getName())) { //$NON-NLS-1$
invalidateBundles(source.getModel());
- } else if(JSFProjectTagLibs.isTLDFile(c) || JSFProjectTagLibs.isFaceletTaglibFile(c)
+ } else if(JSFProjectTagLibs.isTLDFile(c) || TLDUtil.isFaceletTaglib(c)
|| "FileSystemJar".equals(entity)) { //$NON-NLS-1$
invalidateTagLibs(source.getModel());
} else if(entity.startsWith(JSFConstants.ENT_FACESCONFIG)) {
15 years, 2 months
JBoss Tools SVN: r17817 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: selbar and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2009-09-30 09:23:51 -0400 (Wed, 30 Sep 2009)
New Revision: 17817
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4914, selection bar refresh was updated.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2009-09-30 12:49:41 UTC (rev 17816)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2009-09-30 13:23:51 UTC (rev 17817)
@@ -1168,7 +1168,9 @@
* controller could be null.
*/
if (getController() != null) {
- selectionBar.setVisible(selectionBar.getAlwaysVisibleOption());
+ selectionBar.setVisible(JspEditorPlugin.getDefault()
+ .getPreferenceStore().getBoolean(
+ IVpePreferencesPage.SHOW_SELECTION_TAG_BAR));
fillContainer(false, null);
getController().getVisualBuilder().setShowInvisibleTags(JspEditorPlugin.getDefault().getPreferenceStore().getBoolean(
IVpePreferencesPage.SHOW_NON_VISUAL_TAGS));
@@ -1179,7 +1181,6 @@
public void updateSelectionBar(boolean isSelectionBarVisible) {
if (selectionBar != null) {
- selectionBar.setAlwaysVisibleOption(isSelectionBarVisible);
selectionBar.setVisible(isSelectionBarVisible);
} else {
VpePlugin.getDefault().logError("VPE Selection Bar is not initialized.");
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java 2009-09-30 12:49:41 UTC (rev 17816)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java 2009-09-30 13:23:51 UTC (rev 17817)
@@ -98,12 +98,6 @@
private Node currentSelectedNode = null;
private Node currentLastNode = null;
-// private ToolItem arrowButton;
-
-
- final static String PREFERENCE_YES = "yes"; //$NON-NLS-1$
- final static String PREFERENCE_NO = "no"; //$NON-NLS-1$
-
public Composite createToolBarComposite(Composite parent, boolean visible) {
splitter = new Splitter(parent, SWT.NONE);
splitter.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -147,7 +141,6 @@
setAskConfirmationOnClosingSelectionBar(dialog.getToggleState());
}
- setAlwaysVisibleOption(false);
setVisible(false);
}
};
@@ -175,36 +168,6 @@
return splitter;
}
- private void setPersistentOption(String name, String value) {
- XModelObject optionsObject = getOptionsObject();
- optionsObject.setAttributeValue(name, value);
-
- /*
- * Fixes http://jira.jboss.com/jira/browse/JBIDE-2298
- * To get stored in xml XModelObject
- * should be marked as modified.
- */
- optionsObject.setModified(true);
- performStore(optionsObject);
- }
-
- private XModelObject getOptionsObject() {
- XModelObject optionsObject = ModelUtilities.getPreferenceModel()
- .getByPath(VpePreference.VPE_EDITOR_PATH);
- return optionsObject;
- }
-
- public void setAlwaysVisibleOption(boolean visible) {
- final String optionValue;
- if (visible) {
- optionValue = PREFERENCE_YES;
- } else {
- optionValue = PREFERENCE_NO;
- }
-
- setPersistentOption(VpePreference.ATT_SHOW_SELECTION_TAG_BAR, optionValue);
- }
-
public boolean getAlwaysVisibleOption() {
return JspEditorPlugin.getDefault().getPreferenceStore().getBoolean(
IVpePreferencesPage.SHOW_SELECTION_TAG_BAR);
@@ -561,39 +524,6 @@
public void widgetDefaultSelected(SelectionEvent e) {
}
- /**
- * Performs storing model object in the model and xml file.
- *
- * @param xmo the model object to store
- */
- private void performStore(XModelObject xmo) {
- if (null == xmo || null == xmo.getModel()
- || null == xmo.getModelEntity()) {
- return;
- }
-
- ArrayList<IModelPropertyEditorAdapter> adapters = new ArrayList<IModelPropertyEditorAdapter>();
- XAttribute[] attribute = xmo.getModelEntity().getAttributes();
- for (int i = 0; i < attribute.length; i++) {
- if(!attribute[i].isVisible()) {
- continue;
- }
- IModelPropertyEditorAdapter adapter = AdapterFactory.getAdapter(attribute[i], xmo, xmo.getModel());
- adapters.add(adapter);
- }
- /*
- * Stores model object by its adaptors.
- */
- for (IModelPropertyEditorAdapter adapter : adapters) {
- adapter.store();
- }
-
- /*
- * Saves model options
- */
- xmo.getModel().saveOptions();
- }
-
@Override
public String toString() {
StringBuffer st = new StringBuffer("CountItem: "); //$NON-NLS-1$
15 years, 2 months