JBoss Tools SVN: r33103 - trunk/gwt/plugins/org.jboss.tools.gwt.core/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-21 12:19:31 -0400 (Thu, 21 Jul 2011)
New Revision: 33103
Modified:
trunk/gwt/plugins/org.jboss.tools.gwt.core/META-INF/MANIFEST.MF
Log:
[JBIDE-9338] updated dependencies to GWT 2.3 for Eclipse Indigo
Modified: trunk/gwt/plugins/org.jboss.tools.gwt.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/gwt/plugins/org.jboss.tools.gwt.core/META-INF/MANIFEST.MF 2011-07-21 16:09:01 UTC (rev 33102)
+++ trunk/gwt/plugins/org.jboss.tools.gwt.core/META-INF/MANIFEST.MF 2011-07-21 16:19:31 UTC (rev 33103)
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: JBoss Tools GWT (Experimental)
Bundle-SymbolicName: org.jboss.tools.gwt.core;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.0.2.qualifier
Bundle-Activator: org.jboss.tools.gwt.core.internal.GWTCoreActivator
Bundle-Vendor: JBoss by Red Hat
Require-Bundle:
org.jboss.tools.common;bundle-version="[3.2.0,4.0.0)",
com.google.gwt.eclipse.core,
- com.google.gwt.eclipse.sdkbundle.2.2.0;resolution:=optional,
+ com.google.gwt.eclipse.sdkbundle;bundle-version="2.3.0",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.0,2.0.0)",
org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
14 years, 5 months
JBoss Tools SVN: r33102 - branches/jbosstools-3.2.x/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-07-21 12:09:01 -0400 (Thu, 21 Jul 2011)
New Revision: 33102
Modified:
branches/jbosstools-3.2.x/build/target-platform/jbds.target
branches/jbosstools-3.2.x/build/target-platform/multiple.target
branches/jbosstools-3.2.x/build/target-platform/unified.target
Log:
update version of m2e-wtp in TPs
Modified: branches/jbosstools-3.2.x/build/target-platform/jbds.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/jbds.target 2011-07-21 16:08:49 UTC (rev 33101)
+++ branches/jbosstools-3.2.x/build/target-platform/jbds.target 2011-07-21 16:09:01 UTC (rev 33102)
@@ -10,10 +10,10 @@
-->
<repository location="http://download.jboss.org/jbosstools/updates/helios/"/>
- <!-- m2e 1.0 / m2e-wtp 0.13 + deps -->
+ <!-- m2e 1.0 / m2e-wtp 0.13.1.20110718-1012 + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106061504"/>
- <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.20110623-0455"/>
+ <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.1.20110718-1012"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
@@ -179,4 +179,4 @@
</location>
</locations>
- </target>
\ No newline at end of file
+ </target>
Modified: branches/jbosstools-3.2.x/build/target-platform/multiple.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/multiple.target 2011-07-21 16:08:49 UTC (rev 33101)
+++ branches/jbosstools-3.2.x/build/target-platform/multiple.target 2011-07-21 16:09:01 UTC (rev 33102)
@@ -13,10 +13,10 @@
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<repository location="http://download.jboss.org/jbosstools/updates/helios/"/>
- <!-- m2e 1.0 / m2e-wtp 0.13 + deps -->
+ <!-- m2e 1.0 / m2e-wtp 0.13.1.20110718-1012 + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106061504"/>
- <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.11.1.20101108-1810"/>
+ <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.1.20110718-1012"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
@@ -231,4 +231,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
\ No newline at end of file
+</target>
Modified: branches/jbosstools-3.2.x/build/target-platform/unified.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/unified.target 2011-07-21 16:08:49 UTC (rev 33101)
+++ branches/jbosstools-3.2.x/build/target-platform/unified.target 2011-07-21 16:09:01 UTC (rev 33102)
@@ -13,10 +13,10 @@
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
- <!-- m2e 1.0 / m2e-wtp 0.13 + deps -->
+ <!-- m2e 1.0 / m2e-wtp 0.13.1.20110718-1012 + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106061504"/>
- <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.11.1.20101108-1810"/>
+ <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.1.20110718-1012"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
@@ -231,4 +231,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
\ No newline at end of file
+</target>
14 years, 5 months
JBoss Tools SVN: r33101 - branches/jbosstools-3.2.x/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-07-21 12:08:49 -0400 (Thu, 21 Jul 2011)
New Revision: 33101
Modified:
branches/jbosstools-3.2.x/build/parent/pom.xml
Log:
bump from CR3 to CR4
Modified: branches/jbosstools-3.2.x/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/build/parent/pom.xml 2011-07-21 15:43:29 UTC (rev 33100)
+++ branches/jbosstools-3.2.x/build/parent/pom.xml 2011-07-21 16:08:49 UTC (rev 33101)
@@ -15,7 +15,7 @@
<!--tychoVersion>0.10.0-SNAPSHOT</tychoVersion -->
<tychoVersion>0.10.0</tychoVersion>
<scmBranch>branches/jbosstools-3.2.x</scmBranch>
- <BUILD_ALIAS>CR3</BUILD_ALIAS>
+ <BUILD_ALIAS>CR4</BUILD_ALIAS>
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
14 years, 5 months
JBoss Tools SVN: r33100 - in trunk/download.jboss.org/jbosstools/updates: indigo/SR0 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-07-21 11:43:29 -0400 (Thu, 21 Jul 2011)
New Revision: 33100
Modified:
trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/indigo/SR0/compositeArtifacts...
trunk/download.jboss.org/jbosstools/updates/indigo/SR0/compositeContent.xml
Log:
add m2e-wtp 0.13.1 to reqs mirrors
Modified: trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml 2011-07-21 15:43:12 UTC (rev 33099)
+++ trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml 2011-07-21 15:43:29 UTC (rev 33100)
@@ -14,7 +14,7 @@
-->
<property name='p2.timestamp' value='1310665401000'/>
</properties>
-<children size='12'>
+<children size='13'>
<child location='../requirements/helios/SR2/'/>
<child location='../requirements/birt/2.6.2/'/>
<child location='../requirements/ecf/3.4/'/>
@@ -23,10 +23,11 @@
<child location='../requirements/gwt/201012211742/'/>
<child location='../requirements/m2eclipse/20110623-1035/'/>
+<child location='../requirements/m2eclipse/m2eclipse-wtp-0.13.1/'/>
<child location='../requirements/orbit/R20100519200754/'/>
<child location='../requirements/swtbot/2.0.3/'/>
+
<child location='../requirements/tptp/4.7/'/>
-
<child location='../requirements/webtools/3.2.4/'/>
<child location='../requirements/xulrunner-1.9.1.2/'/>
</children>
Modified: trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml 2011-07-21 15:43:12 UTC (rev 33099)
+++ trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml 2011-07-21 15:43:29 UTC (rev 33100)
@@ -12,9 +12,9 @@
endfun
nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1310665412000'/>
+<property name='p2.timestamp' value='1310665401000'/>
</properties>
-<children size='12'>
+<children size='13'>
<child location='../requirements/helios/SR2/'/>
<child location='../requirements/birt/2.6.2/'/>
<child location='../requirements/ecf/3.4/'/>
@@ -23,10 +23,11 @@
<child location='../requirements/gwt/201012211742/'/>
<child location='../requirements/m2eclipse/20110623-1035/'/>
+<child location='../requirements/m2eclipse/m2eclipse-wtp-0.13.1/'/>
<child location='../requirements/orbit/R20100519200754/'/>
<child location='../requirements/swtbot/2.0.3/'/>
+
<child location='../requirements/tptp/4.7/'/>
-
<child location='../requirements/webtools/3.2.4/'/>
<child location='../requirements/xulrunner-1.9.1.2/'/>
</children>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/SR0/compositeArtifacts...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/SR0/compositeArtifacts... 2011-07-21 15:43:12 UTC (rev 33099)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/SR0/compositeArtifacts... 2011-07-21 15:43:29 UTC (rev 33100)
@@ -1,11 +1,11 @@
<?xml version='1.0' encoding='UTF-8'?>
<?compositeArtifactRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Indigo RC2 Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+<repository name='JBoss Tools Requirements - Composite Indigo SR0 Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
<property name='p2.timestamp' value='1308250485000'/>
</properties>
-<children size='10'>
+<children size='11'>
<child location='../../requirements/indigo/201105270900-RC2/'/>
<child location='../../requirements/birt/3.7RC2/'/>
<child location='../../requirements/ecf/3.5/'/>
@@ -13,9 +13,11 @@
<child location='../../requirements/emf/2.7RC3/'/>
<child location='../../requirements/m2eclipse/20110623-1035/'/>
+<child location='../requirements/m2eclipse/m2eclipse-wtp-0.13.1/'/>
<child location='../../requirements/orbit/R20110523182458/'/>
<child location='../../requirements/swtbot/2.0.4/'/>
<child location='../../requirements/webtools/3.3RC2/'/>
+
<child location='../../requirements/xulrunner-1.9.2/'/>
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/SR0/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/SR0/compositeContent.xml 2011-07-21 15:43:12 UTC (rev 33099)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/SR0/compositeContent.xml 2011-07-21 15:43:29 UTC (rev 33100)
@@ -1,11 +1,11 @@
<?xml version='1.0' encoding='UTF-8'?>
<?compositeMetadataRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Indigo RC2 Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+<repository name='JBoss Tools Requirements - Composite Indigo SR0 Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
<property name='p2.timestamp' value='1308250485000'/>
</properties>
-<children size='10'>
+<children size='11'>
<child location='../../requirements/indigo/201105270900-RC2/'/>
<child location='../../requirements/birt/3.7RC2/'/>
<child location='../../requirements/ecf/3.5/'/>
@@ -13,9 +13,11 @@
<child location='../../requirements/emf/2.7RC3/'/>
<child location='../../requirements/m2eclipse/20110623-1035/'/>
+<child location='../requirements/m2eclipse/m2eclipse-wtp-0.13.1/'/>
<child location='../../requirements/orbit/R20110523182458/'/>
<child location='../../requirements/swtbot/2.0.4/'/>
<child location='../../requirements/webtools/3.3RC2/'/>
+
<child location='../../requirements/xulrunner-1.9.2/'/>
</children>
</repository>
14 years, 5 months
JBoss Tools SVN: r33098 - in trunk/maven/plugins/org.jboss.tools.maven.ui: src/org/jboss/tools/maven/ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-07-21 07:59:12 -0400 (Thu, 21 Jul 2011)
New Revision: 33098
Added:
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/generic/
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/generic/GenericCommandActionDelegate.java
Modified:
trunk/maven/plugins/org.jboss.tools.maven.ui/plugin.xml
Log:
JBIDE-8969 : add Select maven profiles to the menu
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/plugin.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/plugin.xml 2011-07-21 10:31:03 UTC (rev 33097)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/plugin.xml 2011-07-21 11:59:12 UTC (rev 33098)
@@ -59,26 +59,54 @@
sequence="Ctrl+Alt+P">
</key>
</extension>
+
+ <extension point="org.eclipse.ui.popupMenus">
+ <objectContribution id="org.jboss.tools.maven.ui.profiles.selectFromProject"
+ objectClass="org.eclipse.core.resources.IProject"
+ adaptable="true">
+ <action id="org.jboss.tools.maven.ui.commands.selectMavenProfileAction"
+ class="org.jboss.tools.maven.ui.generic.GenericCommandActionDelegate:org.jboss.tools.maven.ui.commands.selectMavenProfileCommand"
+ label="%Select_Maven_Profiles"
+ style="push"
+ definitionId="org.jboss.tools.maven.ui.commands.selectMavenProfileCommand"
+ menubarPath="org.eclipse.m2e.core.mavenMenu/open"
+ enablesFor="+"/>
+ <visibility>
+ <and>
+ <objectState name="open" value="true"/>
+ <objectState name="nature" value="org.eclipse.m2e.core.maven2Nature"/>
+ </and>
+ </visibility>
+ </objectContribution>
+
+ <objectContribution id="org.jboss.tools.maven.ui.profiles.selectFromPom"
+ objectClass="org.eclipse.core.resources.IFile"
+ adaptable="true">
+ <action id="org.jboss.tools.maven.ui.commands.selectMavenProfileAction"
+ class="org.jboss.tools.maven.ui.generic.GenericCommandActionDelegate:org.jboss.tools.maven.ui.commands.selectMavenProfileCommand"
+ label="%Select_Maven_Profiles"
+ style="push"
+ menubarPath="org.eclipse.m2e.core.fileMenu/open"
+ enablesFor="+"/>
+ <visibility>
+ <objectState name="name" value="pom.xml"/>
+ </visibility>
+ </objectContribution>
+
+ <objectContribution id="org.jboss.tools.maven.ui.profiles.selectFromWorkingSet"
+ adaptable="true"
+ objectClass="org.eclipse.ui.IWorkingSet">
+ <action id="org.jboss.tools.maven.ui.commands.selectMavenProfileAction"
+ class="org.jboss.tools.maven.ui.generic.GenericCommandActionDelegate:org.jboss.tools.maven.ui.commands.selectMavenProfileCommand"
+ label="%Select_Maven_Profiles"
+ style="push"
+ menubarPath="org.eclipse.m2e.core.workingSetMenu/open"
+ enablesFor="+"/>
+ </objectContribution>
+
+ </extension>
- <!--FIXME I can't make the menu appear in the maven menu-->
- <extension
- point="org.eclipse.ui.menus">
- <menuContribution locationURI="popup:org.eclipse.m2e.core.mavenMenu?after=additions" allPopups="true">
- <!--menuContribution locationURI="popup:common.new.menu?after=new" allPopups="true" -->
- <command
- commandId="org.jboss.tools.maven.ui.commands.selectMavenProfileCommand"
- id="org.jboss.tools.maven.ui.menus.selectMavenProfileCommand"
- mnemonic="P">
-
- <!--reference
- definitionId="org.jboss.tools.maven.ui.mavenProject">
- </reference-->
-
- </command>
- </menuContribution>
- </extension>
-
- <extension
+ <extension
point="org.eclipse.ui.menus">
<menuContribution
locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
@@ -92,24 +120,8 @@
</command>
</toolbar>
</menuContribution>
- </extension>
+ </extension>
- <extension
- point="org.eclipse.core.expressions.definitions">
- <definition id="org.jboss.tools.maven.ui.mavenProject">
- <with variable="selection">
- <iterate ifEmpty="false" operator="or">
- <adapt type="org.eclipse.core.resources.IProject">
- <and>
- <objectState name="open" value="true"/>
- <objectState name="nature" value="org.eclipse.m2e.core.maven2Nature"/>
- </and>
- </adapt>
- </iterate>
- </with>
- </definition>
- </extension>
-
<extension point="org.eclipse.ui.editors.templates">
<template id="org.jboss.tools.maven.editor.xml.templates.repository.jboss.public"
contextTypeId="org.eclipse.m2e.editor.xml.templates.contextType.repositories"
Added: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/generic/GenericCommandActionDelegate.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/generic/GenericCommandActionDelegate.java (rev 0)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/generic/GenericCommandActionDelegate.java 2011-07-21 11:59:12 UTC (rev 33098)
@@ -0,0 +1,248 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ * IBM Corporation - initial API and implementation
+ * Red Hat - minor refactoring
+ *
+ * Original code taken from <a href="http://wiki.eclipse.org/Platform_Command_Framework#Using_an_IActionDelega...">
+ * http://wiki.eclipse.org/Platform_Command_Framework#Using_an_IActionDelega...</a>
+ ******************************************************************************/
+package org.jboss.tools.maven.ui.generic;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.eclipse.core.commands.Command;
+import org.eclipse.core.commands.IParameter;
+import org.eclipse.core.commands.Parameterization;
+import org.eclipse.core.commands.ParameterizedCommand;
+import org.eclipse.core.commands.common.NotDefinedException;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExecutableExtension;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.ui.IEditorActionDelegate;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IObjectActionDelegate;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.ui.commands.ICommandService;
+import org.eclipse.ui.handlers.IHandlerService;
+import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
+
+/**
+ * This action delegate can be used to specify a command with or without
+ * parameters be called from an <action/> specified in actionSets,
+ * editorActions, viewActions, or popupMenus.
+ */
+public class GenericCommandActionDelegate implements
+ IWorkbenchWindowActionDelegate, IViewActionDelegate,
+ IEditorActionDelegate, IObjectActionDelegate, IExecutableExtension {
+
+ /**
+ * The commandId parameter needed when using the <class/> form for
+ * this IActionDelegate. Value is "commandId".
+ */
+ public static final String PARM_COMMAND_ID = "commandId"; //$NON-NLS-1$
+
+ private String commandId = null;
+
+ private Map<?, ?> parameterMap = null;
+
+ private ParameterizedCommand parameterizedCommand = null;
+
+ private IHandlerService handlerService = null;
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
+ */
+ public void dispose() {
+ handlerService = null;
+ parameterizedCommand = null;
+ parameterMap = null;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
+ */
+ public void run(IAction action) {
+ if (handlerService == null) {
+ // what, no handler service ... no problem
+ return;
+ }
+ try {
+ if (commandId != null) {
+ handlerService.executeCommand(commandId, null);
+ } else if (parameterizedCommand != null) {
+ handlerService.executeCommand(parameterizedCommand, null);
+ }
+ // else there is no command for this delegate
+ } catch (Exception e) {
+ // exceptions reduced for brevity
+ // and we won't just do a print out :-)
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
+ * org.eclipse.jface.viewers.ISelection)
+ */
+ public void selectionChanged(IAction action, ISelection selection) {
+ // we don't care, handlers get their selection from the
+ // ExecutionEvent application context
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement,
+ * java.lang.String, java.lang.Object)
+ */
+ public void setInitializationData(IConfigurationElement config,
+ String propertyName, Object data) throws CoreException {
+ String id = config.getAttribute(IWorkbenchRegistryConstants.ATT_ID);
+ // save the data until our init(*) call, where we can get
+ // the services.
+ if (data instanceof String) {
+ commandId = (String) data;
+ } else if (data instanceof Map) {
+ parameterMap = (Map<?, ?>) data;
+ if (parameterMap.get(PARM_COMMAND_ID) == null) {
+ Status status = new Status(IStatus.ERROR,
+ "org.jboss.tools.maven.ui.generic", "The '" + id
+ + "' action won't work without a commandId");
+ throw new CoreException(status);
+ }
+ } else {
+ Status status = new Status(
+ IStatus.ERROR,
+ "org.jboss.tools.maven.ui.generic",
+ "The '"
+ + id
+ + "' action won't work without some initialization parameters");
+ throw new CoreException(status);
+ }
+ }
+
+ /**
+ * Build a command from the executable extension information.
+ *
+ * @param commandService
+ * to get the Command object
+ */
+ private void createCommand(ICommandService commandService) {
+ String id = (String) parameterMap.get(PARM_COMMAND_ID);
+ if (id == null) {
+ return;
+ }
+ if (parameterMap.size() == 1) {
+ commandId = id;
+ return;
+ }
+ try {
+ Command cmd = commandService.getCommand(id);
+ if (!cmd.isDefined()) {
+ // command not defined? no problem ...
+ return;
+ }
+ ArrayList<Parameterization> parameters = new ArrayList<Parameterization>();
+ Iterator<?> i = parameterMap.keySet().iterator();
+ while (i.hasNext()) {
+ String parmName = (String) i.next();
+ if (PARM_COMMAND_ID.equals(parmName)) {
+ continue;
+ }
+ IParameter parm = cmd.getParameter(parmName);
+ if (parm == null) {
+ // asking for a bogus parameter? No problem
+ return;
+ }
+ parameters.add(new Parameterization(parm, (String) parameterMap
+ .get(parmName)));
+ }
+ parameterizedCommand = new ParameterizedCommand(cmd,
+ (Parameterization[]) parameters
+ .toArray(new Parameterization[parameters.size()]));
+ } catch (NotDefinedException e) {
+ // command is bogus? No problem, we'll do nothing.
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
+ */
+ public void init(IWorkbenchWindow window) {
+ if (handlerService != null) {
+ // already initialized
+ return;
+ }
+
+ handlerService = (IHandlerService) window
+ .getService(IHandlerService.class);
+ if (parameterMap != null) {
+ ICommandService commandService = (ICommandService) window
+ .getService(ICommandService.class);
+ createCommand(commandService);
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
+ */
+ public void init(IViewPart view) {
+ init(view.getSite().getWorkbenchWindow());
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction,
+ * org.eclipse.ui.IEditorPart)
+ */
+ public void setActiveEditor(IAction action, IEditorPart targetEditor) {
+ // we don't actually care about the active editor, since that
+ // information is in the ExecutionEvent application context
+ // but we need to make sure we're initialized.
+ if (targetEditor != null) {
+ init(targetEditor.getSite().getWorkbenchWindow());
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction,
+ * org.eclipse.ui.IWorkbenchPart)
+ */
+ public void setActivePart(IAction action, IWorkbenchPart targetPart) {
+ // we don't actually care about the active part, since that
+ // information is in the ExecutionEvent application context
+ // but we need to make sure we're initialized.
+ if (targetPart != null) {
+ init(targetPart.getSite().getWorkbenchWindow());
+ }
+ }
+}
+
14 years, 5 months
JBoss Tools SVN: r33097 - in trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui: internal/profiles and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-07-21 06:31:03 -0400 (Thu, 21 Jul 2011)
New Revision: 33097
Modified:
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties
Log:
JBIDE-8969 : displays an information dialog when the Maven Profile Selection dialog can not be opened
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java 2011-07-21 09:51:59 UTC (rev 33096)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java 2011-07-21 10:31:03 UTC (rev 33097)
@@ -56,6 +56,9 @@
public static String ConfiguratorPreferencePage_When_importing_Maven_projects_configure_the_following;
public static String ProfileManager_Updating_maven_profiles;
+ public static String ProfileSelectionHandler_Maven_Builder_still_processing;
+ public static String ProfileSelectionHandler_Select_some_maven_projects;
+ public static String ProfileSelectionHandler_Unable_to_open_profile_dialog;
public static String SelectProfilesDialog_autoactivated;
public static String SelectProfilesDialog_Activate_menu;
public static String SelectProfilesDialog_Active_Profiles_for_Project;
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java 2011-07-21 09:51:59 UTC (rev 33096)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java 2011-07-21 10:31:03 UTC (rev 33097)
@@ -29,6 +29,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.window.Window;
@@ -57,104 +58,120 @@
*/
public Object execute(ExecutionEvent event) throws ExecutionException {
IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event);
- final Set<IMavenProjectFacade> facades = getSelectedMavenProjects(event);
- if (facades != null && !facades.isEmpty() ) {
-
- System.out.print("Select projects "+facades);
-
- final IProfileManager profileManager = MavenCoreActivator.getDefault().getProfileManager();
- final List<ProfileSelection> sharedProfiles;
- final Map<IMavenProjectFacade, List<ProfileStatus>> allProfiles;
- try {
- allProfiles = getAllProfiles(facades, profileManager);
- sharedProfiles = getSharedProfiles(allProfiles);
- } catch (CoreException e) {
- throw new ExecutionException("Unable to open the Maven Profile selection dialog", e);
- }
- final SelectProfilesDialog dialog = new SelectProfilesDialog(window.getShell(),
- facades,
- sharedProfiles);
- //dialog.setBlockOnOpen(false); doesn't work
- if(dialog.open() == Window.OK) {
-
- WorkspaceJob job = new WorkspaceJob(Messages.ProfileManager_Updating_maven_profiles) {
+ final Set<IMavenProjectFacade> allfacades = getSelectedMavenProjects(event);
+
+ if (allfacades.isEmpty()) {
+ display(window, Messages.ProfileSelectionHandler_Select_some_maven_projects);
+ return null;
+ }
- public IStatus runInWorkspace(IProgressMonitor monitor) {
- try {
+ Set<IMavenProjectFacade> facades = getValidMavenProjects(allfacades);
+ if (facades.isEmpty()) {
+ display(window, Messages.ProfileSelectionHandler_Maven_Builder_still_processing);
+ return null;
+ }
+
+ System.out.print("Select projects "+facades); //$NON-NLS-1$
+
+ final IProfileManager profileManager = MavenCoreActivator.getDefault().getProfileManager();
+ final List<ProfileSelection> sharedProfiles;
+ final Map<IMavenProjectFacade, List<ProfileStatus>> allProfiles;
+ try {
+ allProfiles = getAllProfiles(facades, profileManager);
+ sharedProfiles = getSharedProfiles(allProfiles);
+ } catch (CoreException e) {
+ throw new ExecutionException(Messages.ProfileSelectionHandler_Unable_to_open_profile_dialog, e);
+ }
+ final SelectProfilesDialog dialog = new SelectProfilesDialog(window.getShell(),
+ facades,
+ sharedProfiles);
+ //dialog.setBlockOnOpen(false); doesn't work
+ if(dialog.open() == Window.OK) {
+
+ WorkspaceJob job = new WorkspaceJob(Messages.ProfileManager_Updating_maven_profiles) {
+
+ public IStatus runInWorkspace(IProgressMonitor monitor) {
+ try {
+
+ for (Map.Entry<IMavenProjectFacade, List<ProfileStatus>> entry : allProfiles.entrySet()){
+
+ IMavenProjectFacade facade = entry.getKey();
+ List<String> activeProfiles = getActiveProfiles(sharedProfiles, entry.getValue());
- for (Map.Entry<IMavenProjectFacade, List<ProfileStatus>> entry : allProfiles.entrySet()){
-
- IMavenProjectFacade facade = entry.getKey();
- List<String> activeProfiles = getActiveProfiles(sharedProfiles, entry.getValue());
-
- profileManager.updateActiveProfiles(facade, activeProfiles,
- dialog.isOffline(), dialog.isForceUpdate(), monitor);
- }
- } catch (CoreException ex) {
- Activator.log(ex);
- return ex.getStatus();
+ profileManager.updateActiveProfiles(facade, activeProfiles,
+ dialog.isOffline(), dialog.isForceUpdate(), monitor);
}
- return Status.OK_STATUS;
+ } catch (CoreException ex) {
+ Activator.log(ex);
+ return ex.getStatus();
}
+ return Status.OK_STATUS;
+ }
- private List<String> getActiveProfiles(
- List<ProfileSelection> sharedProfiles,
- List<ProfileStatus> availableProfiles) {
- List<String> ids = new ArrayList<String>();
-
- for (ProfileStatus st : availableProfiles) {
- ProfileSelection selection = findSelectedProfile(st.getId(), sharedProfiles);
- String id = null;
- boolean isDisabled = false;
- if (selection == null) {
- //was not displayed. Use existing value.
+ private List<String> getActiveProfiles(
+ List<ProfileSelection> sharedProfiles,
+ List<ProfileStatus> availableProfiles) {
+ List<String> ids = new ArrayList<String>();
+
+ for (ProfileStatus st : availableProfiles) {
+ ProfileSelection selection = findSelectedProfile(st.getId(), sharedProfiles);
+ String id = null;
+ boolean isDisabled = false;
+ if (selection == null) {
+ //was not displayed. Use existing value.
+ if (st.isUserSelected()) {
+ id = st.getId();
+ isDisabled = st.getActivationState().equals(ProfileState.Disabled);
+ }
+ } else {
+ if (null == selection.getSelected()) {
+ //Value was displayed but its state is unknown, use previous state
if (st.isUserSelected()) {
id = st.getId();
isDisabled = st.getActivationState().equals(ProfileState.Disabled);
}
} else {
- if (null == selection.getSelected()) {
- //Value was displayed but its state is unknown, use previous state
- if (st.isUserSelected()) {
- id = st.getId();
- isDisabled = st.getActivationState().equals(ProfileState.Disabled);
- }
- } else {
- //Value was displayed and is consistent
- if (Boolean.TRUE.equals(selection.getSelected())) {
- id = selection.getId();
- isDisabled = selection.getActivationState().equals(ProfileState.Disabled);
- }
+ //Value was displayed and is consistent
+ if (Boolean.TRUE.equals(selection.getSelected())) {
+ id = selection.getId();
+ isDisabled = selection.getActivationState().equals(ProfileState.Disabled);
}
}
-
- if (id != null) {
- if (isDisabled) {
- id = "!"+id;
- }
- ids.add(id);
+ }
+
+ if (id != null) {
+ if (isDisabled) {
+ id = "!"+id; //$NON-NLS-1$
}
+ ids.add(id);
}
- return ids;
}
+ return ids;
+ }
- private ProfileSelection findSelectedProfile(String id,
- List<ProfileSelection> sharedProfiles) {
- for (ProfileSelection sel : sharedProfiles) {
- if (id.equals(sel.getId())) {
- return sel;
- }
+ private ProfileSelection findSelectedProfile(String id,
+ List<ProfileSelection> sharedProfiles) {
+ for (ProfileSelection sel : sharedProfiles) {
+ if (id.equals(sel.getId())) {
+ return sel;
}
- return null;
}
- };
- job.setRule( MavenPlugin.getProjectConfigurationManager().getRule());
- job.schedule();
- }
- }
+ return null;
+ }
+ };
+ job.setRule( MavenPlugin.getProjectConfigurationManager().getRule());
+ job.schedule();
+ }
return null;
}
+ private void display(IWorkbenchWindow window, String message) {
+ MessageDialog.openInformation(
+ window.getShell(),
+ Messages.SelectProfilesDialog_Select_Maven_profiles,
+ message);
+ }
+
private List<ProfileSelection> getSharedProfiles(
Map<IMavenProjectFacade, List<ProfileStatus>> projectProfilesMap) {
@@ -243,6 +260,7 @@
private Set<IMavenProjectFacade> getSelectedMavenProjects(ExecutionEvent event) {
ISelection selection = HandlerUtil.getCurrentSelection(event);
IProject[] projects = getSelectedProjects(selection);
+ Set<IMavenProjectFacade> facades = new HashSet<IMavenProjectFacade>();
try {
if (projects.length == 0) {
IEditorInput input = HandlerUtil.getActiveEditorInput(event);
@@ -251,24 +269,31 @@
projects = new IProject[]{fileInput.getFile().getProject()};
}
}
- Set<IMavenProjectFacade> facades = new HashSet<IMavenProjectFacade>();
for (IProject p : projects) {
if (p != null && p.isAccessible() && p.hasNature(IMavenConstants.NATURE_ID)) {
IMavenProjectFacade facade =MavenPlugin.getMavenProjectRegistry().getProject(p);
- if (facade.getMavenProject() == null) {
- System.err.println(facade.getProject() + " facade has no MavenProject!!!");
- } else {
- facades.add(facade);
- }
+ facades.add(facade);
}
}
- return facades;
} catch (CoreException e) {
Activator.log(e);
}
- return null;
+ return facades;
}
+
+ private Set<IMavenProjectFacade> getValidMavenProjects(Set<IMavenProjectFacade> facades) {
+ Set<IMavenProjectFacade> validFacades = new HashSet<IMavenProjectFacade>(facades);
+ Iterator<IMavenProjectFacade> ite = validFacades.iterator();
+ while (ite.hasNext()) {
+ IMavenProjectFacade facade = ite.next();
+ if (facade.getMavenProject() == null) {
+ System.err.println(facade.getProject() + " facade has no MavenProject!!!"); //$NON-NLS-1$
+ ite.remove();
+ }
+ }
+ return validFacades;
+ }
private IProject[] getSelectedProjects(ISelection selection) {
Set<IProject> projects = new HashSet<IProject>();
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties 2011-07-21 09:51:59 UTC (rev 33096)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties 2011-07-21 10:31:03 UTC (rev 33097)
@@ -35,6 +35,9 @@
ConfiguratorPreferencePage_When_importing_Maven_projects_configure_the_following=When importing Maven projects configure the following:
ProfileManager_Updating_maven_profiles=Updating maven profiles
+ProfileSelectionHandler_Maven_Builder_still_processing=The maven builder has not finished processing the selected project(s) yet.
+ProfileSelectionHandler_Select_some_maven_projects=You must select at least one active Maven project
+ProfileSelectionHandler_Unable_to_open_profile_dialog=Unable to open the Maven Profile selection dialog
SelectProfilesDialog_Activate_menu=Activate {0}
SelectProfilesDialog_Active_Profiles_for_Project=Active profiles for {0} :
SelectProfilesDialog_autoactivated=\ (auto activated)
14 years, 5 months
JBoss Tools SVN: r33096 - in trunk/jst/plugins/org.jboss.tools.jst.jsp: src/org/jboss/tools/jst/jsp/jspeditor and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-07-21 05:51:59 -0400 (Thu, 21 Jul 2011)
New Revision: 33096
Added:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBarHandler.java
Removed:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/handlers/SelectionBarHandler.java
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java
Log:
https://issues.jboss.org/browse/JBIDE-8439 Selection Bar dissapears on VPE part when it lost focus for Find/Replace dialogs of content assist proposal list windoe
- fixed issue
- made refactoring
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2011-07-21 03:00:08 UTC (rev 33095)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2011-07-21 09:51:59 UTC (rev 33096)
@@ -493,7 +493,7 @@
</enabledWhen>
</handler>
<handler
- class="org.jboss.tools.jst.jsp.selection.bar.handlers.SelectionBarHandler"
+ class="org.jboss.tools.jst.jsp.selection.bar.SelectionBarHandler"
commandId="org.jboss.tools.jst.jsp.commands.showSelectionBar">
</handler>
<handler
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2011-07-21 03:00:08 UTC (rev 33095)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2011-07-21 09:51:59 UTC (rev 33096)
@@ -88,6 +88,7 @@
import org.jboss.tools.jst.jsp.editor.IVisualEditor;
import org.jboss.tools.jst.jsp.editor.IVisualEditorFactory;
import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage;
+import org.jboss.tools.jst.jsp.selection.bar.SelectionBarHandler;
import org.jboss.tools.jst.web.tld.VpeTaglibManager;
import org.jboss.tools.jst.web.tld.VpeTaglibManagerProvider;
@@ -268,9 +269,9 @@
}
ICommandService commandService = (ICommandService) PlatformUI
- .getWorkbench().getService(ICommandService.class);
- commandService.refreshElements("org.jboss.tools.jst.jsp.commands.showSelectionBar", null); //$NON-NLS-1$
-
+ .getWorkbench().getService(ICommandService.class);
+ commandService.refreshElements(SelectionBarHandler.COMMAND_ID, null);
+ getSelectionBar().refreshVisibility();
superPageChange(newPageIndex);
JspEditorPlugin.getDefault().getPreferenceStore().
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java 2011-07-21 03:00:08 UTC (rev 33095)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java 2011-07-21 09:51:59 UTC (rev 33096)
@@ -354,6 +354,10 @@
protected CTabFolder getTabFolder() {
return tabFolderContainer;
}
+
+ public SelectionBar getSelectionBar() {
+ return selectionBar;
+ }
protected void handlePropertyChange(int propertyId) {
firePropertyChange(propertyId);
@@ -377,33 +381,8 @@
return false;
}
- protected void pageChange(int newPageIndex) {
- Control control = getControl(newPageIndex);
- if (control != null) {
- control.setVisible(true);
- }
+ protected abstract void pageChange(int newPageIndex);
- setFocus();
- IEditorPart activeEditor = getEditor(newPageIndex);
- IEditorActionBarContributor contributor = getEditorSite()
- .getActionBarContributor();
- if (contributor != null
- && contributor instanceof MultiPageEditorActionBarContributor) {
- ((MultiPageEditorActionBarContributor) contributor)
- .setActivePage(activeEditor);
- }
- if (activeEditor != null) {
- ISelectionProvider selectionProvider = activeEditor.getSite()
- .getSelectionProvider();
- if (selectionProvider != null) {
- SelectionChangedEvent event = new SelectionChangedEvent(
- selectionProvider, selectionProvider.getSelection());
- ((MultiPageSelectionProvider) getSite().getSelectionProvider())
- .fireSelectionChanged(event);
- }
- }
- }
-
private void disposePart(final IWorkbenchPart part) {
SafeRunner.run(new SafeRunnable() {
public void run() {
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java 2011-07-21 03:00:08 UTC (rev 33095)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java 2011-07-21 09:51:59 UTC (rev 33096)
@@ -49,14 +49,19 @@
import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.swt.widgets.ToolItem;
import org.eclipse.swt.widgets.Widget;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.commands.ICommandService;
import org.eclipse.ui.internal.IWorkbenchGraphicConstants;
import org.eclipse.ui.internal.WorkbenchImages;
+import org.eclipse.ui.part.EditorPart;
import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
import org.eclipse.wst.sse.ui.StructuredTextEditor;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditorPart;
import org.jboss.tools.jst.jsp.messages.JstUIMessages;
import org.jboss.tools.jst.jsp.selection.SelectionHelper;
import org.jboss.tools.jst.jsp.selection.SourceSelection;
@@ -73,7 +78,7 @@
* @author yradtsevich
* @author mareshkau
*/
-public class SelectionBar extends Composite implements ISelectionChangedListener, IStateListener,ICommandListener{
+public class SelectionBar extends Composite {
private static final int SEL_ITEM_RIGHT_MARGIN = 5;
/*
* The main composite that holds all other controls
@@ -104,24 +109,39 @@
*/
private State toggleSelBarState;
private Command toggleSelBarCommand;
+ private ICommandListener toggleSelBarCommandListener;
+ private ISelectionChangedListener selectionChangedListener;
private ImageButton arrowButton;
public SelectionBar(StructuredTextEditor textEditor, Composite parent,
int style) {
super(parent, style);
this.textEditor = textEditor;
- if(this.textEditor.getTextViewer()!= null) {
- this.textEditor.getTextViewer().addSelectionChangedListener(this);
+
+ if (this.textEditor.getTextViewer() != null) {
+ selectionChangedListener = new ISelectionChangedListener() {
+ @Override
+ public void selectionChanged(SelectionChangedEvent event) {
+ updateNodes(true);
+ }
+ };
+ this.textEditor.getTextViewer().addSelectionChangedListener(selectionChangedListener);
}
-
+
ICommandService commandService = (ICommandService) PlatformUI
.getWorkbench().getService(ICommandService.class);
- this.toggleSelBarCommand = commandService
- .getCommand("org.jboss.tools.jst.jsp.commands.showSelectionBar"); //$NON-NLS-1$
+ this.toggleSelBarCommand = commandService.getCommand(SelectionBarHandler.COMMAND_ID);
toggleSelBarState = toggleSelBarCommand
.getState("org.eclipse.ui.commands.toggleState"); //$NON-NLS-1$
- toggleSelBarState.addListener(this);
- toggleSelBarCommand.addCommandListener(this);
+
+ toggleSelBarCommandListener = new ICommandListener() {
+ @Override
+ public void commandChanged(CommandEvent commandEvent) {
+ refreshVisibility();
+ }
+ };
+ toggleSelBarCommand.addCommandListener(toggleSelBarCommandListener);
+
this.setLayout(new FillLayout());
/*
* Create the Selection Bar Composite in its constructor
@@ -158,6 +178,7 @@
.getImage(ISharedImages.IMG_TOOL_DELETE);
final Listener closeListener = new Listener() {
+ @Override
public void handleEvent(Event event) {
/*
* Hide the selection bar
@@ -194,6 +215,7 @@
* Sets {@code visible} state to this {@code SelectionBar} and fires
* all registered {@code VisibilityListener}s.
*/
+ @Override
public void setVisible(boolean visible) {
if (visible) {
splitter.setVisible(realBar, true);
@@ -214,8 +236,22 @@
this.getParent().layout(true, true);
tempItem.dispose();
}
+
+ public void refreshVisibility() {
+ boolean visible = (Boolean) toggleSelBarState.getValue();
+ IEditorPart editorPart = textEditor.getEditorPart();
+ if(editorPart instanceof JSPMultiPageEditor){
+ JSPMultiPageEditor jspEditor = (JSPMultiPageEditor) editorPart;
+ if(jspEditor.getSelectedPageIndex() == jspEditor.getPreviewIndex()){
+ visible = false;
+ }
+ }
+
+ setVisible(visible);
+ }
+
/**
* Updates buttons in the selection bar and the drop-down menu
* according to the source selection.
@@ -291,9 +327,9 @@
// for now dropDownMenu = null
int elementCounter = 0;
- while ((node != null)
- && ((node.getNodeType() == Node.ELEMENT_NODE)
- || (node.getNodeType() == Node.COMMENT_NODE))) {
+ while (node != null
+ && (node.getNodeType() == Node.ELEMENT_NODE
+ || node.getNodeType() == Node.COMMENT_NODE)) {
addNodeListenerTo(node);
/*
@@ -311,12 +347,14 @@
/*
* for the last tag -- show check button
*/
- if ((elementCounter == 0) && (list.size() == 0)){
+ if (elementCounter == 0 && list.size() == 0){
item = new ToolItem(toolbar, SWT.FLAT | SWT.CHECK, 1);
item.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetSelected(SelectionEvent e) {
handleSelectionEvent(e);
}
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {
handleSelectionEvent(e);
}
@@ -334,6 +372,7 @@
* Thus unnecessary memory will be released.
*/
item.addDisposeListener(new DisposeListener() {
+ @Override
public void widgetDisposed(DisposeEvent e) {
dropdownListener.disposeMenu();
}
@@ -359,9 +398,11 @@
if (dropDownMenu != null) {
MenuItem menuItem = new MenuItem(dropDownMenu, SWT.CHECK, 0);
menuItem.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetSelected(SelectionEvent e) {
handleSelectionEvent(e);
}
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {
handleSelectionEvent(e);
}
@@ -388,6 +429,7 @@
if (!resizeListenerAdded ) {
realBar.addListener(SWT.Resize, new Listener() {
+ @Override
public void handleEvent(Event event) {
updateNodes(true);
}
@@ -438,6 +480,7 @@
arrowButton.setEnabled(false);
arrowButton.addSelectionListener(
new Listener() {
+ @Override
public void handleEvent(Event event) {
Rectangle bounds = arrowButton.getButtonBounds();
Point point = toolbar.toDisplay(bounds.x, bounds.y
@@ -512,12 +555,14 @@
nodeNotifiers.clear();
}
- public void dispose() {
+ @Override
+ public void dispose() {
removeNodeListenerFromAllNodes();
- toggleSelBarCommand.removeCommandListener(this);
- if(textEditor.getTextViewer()!=null)
- textEditor.getTextViewer().removeSelectionChangedListener(this);
- toggleSelBarState.removeListener(this);
+ toggleSelBarCommand.removeCommandListener(toggleSelBarCommandListener);
+ if (textEditor.getTextViewer() != null) {
+ textEditor.getTextViewer().removeSelectionChangedListener(selectionChangedListener);
+ }
+
if (splitter != null) {
splitter.dispose();
splitter = null;
@@ -601,6 +646,7 @@
menuItem.setText(node.getNodeName());
menuItem.setData(node);
menuItem.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent event) {
handleSelectionEvent(event);
}
@@ -613,6 +659,7 @@
* @param event
* the event that trigged this call
*/
+ @Override
public void widgetSelected(SelectionEvent event) {
/*
* If they clicked the arrow, we show the list or close it
@@ -629,18 +676,20 @@
*/
if (menu == null) {
menu = new Menu(dropdown.getParent());
- if ((children != null) && (children.size() > 0)) {
+ if (children != null && children.size() > 0) {
for (Node node : children) {
add(node);
}
}
}
menu.addMenuListener(new MenuListener() {
+ @Override
public void menuShown(MenuEvent e) {
/*
* Do nothing
*/
}
+ @Override
public void menuHidden(MenuEvent e) {
/*
* Change the 'shown' state
@@ -667,18 +716,6 @@
}
}
}
-
- public void selectionChanged(SelectionChangedEvent event) {
- updateNodes(true);
- }
-
- public void handleStateChange(State state, Object oldValue) {
- setVisible(toggleSelBarCommand.isEnabled()&&(Boolean)state.getValue());
- }
-
- public void commandChanged(CommandEvent commandEvent) {
- setVisible(toggleSelBarCommand.isEnabled()&&(Boolean)commandEvent.getCommand().getState("org.eclipse.ui.commands.toggleState").getValue()); //$NON-NLS-1$
- }
}
/**
@@ -695,6 +732,7 @@
public ImageButton(Composite parent, Image image, String toolTip) {
composite = new Composite(parent, SWT.NONE);
composite.addDisposeListener(new DisposeListener() {
+ @Override
public void widgetDisposed(DisposeEvent e) {
release();
}
@@ -787,7 +825,8 @@
* identity comparison to 'type', but this is not required, that is, the
* decision can be based on complex logic.
*/
- public boolean isAdapterForType(Object type) {
+ @Override
+ public boolean isAdapterForType(Object type) {
return selectionBar == type;
}
@@ -798,8 +837,8 @@
* ISSUE: may be more evolvable if the argument was one big 'notifier
* event' instance.
*/
- public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
+ @Override
+ public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
selectionBar.updateNodes(false);
}
- }
-
+}
Copied: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBarHandler.java (from rev 33041, trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/handlers/SelectionBarHandler.java)
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBarHandler.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBarHandler.java 2011-07-21 09:51:59 UTC (rev 33096)
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.jst.jsp.selection.bar;
+
+import java.util.Map;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.HandlerEvent;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.ui.ISources;
+import org.eclipse.ui.commands.IElementUpdater;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.eclipse.ui.menus.UIElement;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+
+/**
+ * Selection bar handler
+ */
+public class SelectionBarHandler extends AbstractHandler implements IElementUpdater {
+
+ public static final String COMMAND_ID = "org.jboss.tools.jst.jsp.commands.showSelectionBar"; //$NON-NLS-1$
+
+ /**
+ * The constructor.
+ */
+ public SelectionBarHandler() {
+ }
+
+ @Override
+ public void setEnabled(Object evaluationContext) {
+ boolean enabled = false;
+
+ if (evaluationContext instanceof IEvaluationContext) {
+ IEvaluationContext context = (IEvaluationContext) evaluationContext;
+ Object activeEditor = context.getVariable(ISources.ACTIVE_EDITOR_NAME);
+ if(activeEditor instanceof JSPMultiPageEditor){
+ JSPMultiPageEditor jspEditor = (JSPMultiPageEditor) activeEditor;
+ if(jspEditor.getSelectedPageIndex() != jspEditor.getPreviewIndex()){
+ enabled = true;
+ }
+ }
+ }
+
+ if (enabled != isEnabled()) {
+ setBaseEnabled(enabled);
+ }
+ }
+
+ /**
+ * the command has been executed, so extract extract the needed information
+ * from the application context.
+ */
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ HandlerUtil.toggleCommandState(event.getCommand());
+ return null;
+ }
+
+ public void updateElement(UIElement element, Map parameters) {
+ fireHandlerChanged(new HandlerEvent(this, true, false));
+ }
+
+}
Deleted: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/handlers/SelectionBarHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/handlers/SelectionBarHandler.java 2011-07-21 03:00:08 UTC (rev 33095)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/handlers/SelectionBarHandler.java 2011-07-21 09:51:59 UTC (rev 33096)
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-
-package org.jboss.tools.jst.jsp.selection.bar.handlers;
-
-import java.util.Map;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.HandlerEvent;
-import org.eclipse.core.expressions.IEvaluationContext;
-import org.eclipse.ui.ISources;
-import org.eclipse.ui.commands.IElementUpdater;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.menus.UIElement;
-import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
-
-/**
- * Selection bar handler
- */
-public class SelectionBarHandler extends AbstractHandler implements IElementUpdater{
-
- /**
- * The constructor.
- */
- public SelectionBarHandler() {
- }
-
- @Override
- public void setEnabled(Object evaluationContext) {
- boolean enabled = false;
-
- if (evaluationContext instanceof IEvaluationContext) {
- IEvaluationContext context = (IEvaluationContext) evaluationContext;
- Object activeEditor = context.getVariable(ISources.ACTIVE_EDITOR_NAME);
- if(activeEditor instanceof JSPMultiPageEditor){
- JSPMultiPageEditor jspEditor = (JSPMultiPageEditor) activeEditor;
- if(jspEditor.getSelectedPageIndex() != jspEditor.getPreviewIndex()){
- enabled = true;
- }
- }
- }
-
- if (enabled != isEnabled()) {
- setBaseEnabled(enabled);
- }
- }
-
- /**
- * the command has been executed, so extract extract the needed information
- * from the application context.
- */
- public Object execute(ExecutionEvent event) throws ExecutionException {
- HandlerUtil.toggleCommandState(event.getCommand());
- return null;
- }
-
- public void updateElement(UIElement element, Map parameters) {
- fireHandlerChanged(new HandlerEvent(this, true, false));
- }
-
-}
14 years, 5 months
JBoss Tools SVN: r33095 - branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-07-20 23:00:08 -0400 (Wed, 20 Jul 2011)
New Revision: 33095
Added:
branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
Removed:
branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Book_Info.xml
Modified:
branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/4.1.0_Release_Notes.xml
Log:
updated to reinstate file as 'Article_Info.xml' as I think there is an error with brew and the file does not need to be called 'Book_Info.xml'
Modified: branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/4.1.0_Release_Notes.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/4.1.0_Release_Notes.xml 2011-07-21 02:29:20 UTC (rev 33094)
+++ branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/4.1.0_Release_Notes.xml 2011-07-21 03:00:08 UTC (rev 33095)
@@ -1,7 +1,4 @@
<?xml version='1.0' encoding='utf-8' ?>
-
-<!-- This article will dsplay the release notes for version 4.0.0, and be found at http://docs.redhat.com/docs/en-US/JBoss_Developer_Studio/4.0/html-single/... -->
-
<article>
<xi:include href="Article_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
<xi:include href="Overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
Added: branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml (rev 0)
+++ branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2011-07-21 03:00:08 UTC (rev 33095)
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='utf-8' ?>
+
+<!-- Modify the title tag to change which book will be built -->
+
+<articleinfo>
+ <title>4.1.0 Release Notes</title>
+ <subtitle>Information about the changes made for this release of the JBoss Developer Studio.</subtitle>
+ <productname>JBoss Developer Studio</productname>
+ <productnumber>4.1</productnumber>
+ <edition>0</edition>
+ <pubsnumber>3</pubsnumber>
+ <abstract>
+ <para>
+ These release notes contain important information related to the JBoss Developer Studio. New features, known issues, resources, and other current issues are addressed here.
+ </para>
+ </abstract>
+ <corpauthor>
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" />
+ </imageobject>
+ </inlinemediaobject>
+ </corpauthor>
+ <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+</articleinfo>
Deleted: branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Book_Info.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Book_Info.xml 2011-07-21 02:29:20 UTC (rev 33094)
+++ branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Book_Info.xml 2011-07-21 03:00:08 UTC (rev 33095)
@@ -1,26 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-
-<!-- Modify the title tag to change which book will be built -->
-
-<articleinfo>
- <title>4.1.0 Release Notes</title>
- <subtitle>Information about the changes made for this release of the JBoss Developer Studio.</subtitle>
- <productname>JBoss Developer Studio</productname>
- <productnumber>4.1</productnumber>
- <edition>0</edition>
- <pubsnumber>3</pubsnumber>
- <abstract>
- <para>
- These release notes contain important information related to the JBoss Developer Studio. New features, known issues, resources, and other current issues are addressed here.
- </para>
- </abstract>
- <corpauthor>
- <inlinemediaobject>
- <imageobject>
- <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" />
- </imageobject>
- </inlinemediaobject>
- </corpauthor>
- <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
- <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-</articleinfo>
14 years, 5 months
JBoss Tools SVN: r33094 - branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-07-20 22:29:20 -0400 (Wed, 20 Jul 2011)
New Revision: 33094
Added:
branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Book_Info.xml
Removed:
branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
Log:
changing article info to be called book info for new brew requirement
Deleted: branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2011-07-21 02:28:24 UTC (rev 33093)
+++ branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2011-07-21 02:29:20 UTC (rev 33094)
@@ -1,26 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-
-<!-- Modify the title tag to change which book will be built -->
-
-<articleinfo>
- <title>4.1.0 Release Notes</title>
- <subtitle>Information about the changes made for this release of the JBoss Developer Studio.</subtitle>
- <productname>JBoss Developer Studio</productname>
- <productnumber>4.1</productnumber>
- <edition>0</edition>
- <pubsnumber>2</pubsnumber>
- <abstract>
- <para>
- These release notes contain important information related to the JBoss Developer Studio. New features, known issues, resources, and other current issues are addressed here.
- </para>
- </abstract>
- <corpauthor>
- <inlinemediaobject>
- <imageobject>
- <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" />
- </imageobject>
- </inlinemediaobject>
- </corpauthor>
- <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
- <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-</articleinfo>
Added: branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Book_Info.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Book_Info.xml (rev 0)
+++ branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Book_Info.xml 2011-07-21 02:29:20 UTC (rev 33094)
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='utf-8' ?>
+
+<!-- Modify the title tag to change which book will be built -->
+
+<articleinfo>
+ <title>4.1.0 Release Notes</title>
+ <subtitle>Information about the changes made for this release of the JBoss Developer Studio.</subtitle>
+ <productname>JBoss Developer Studio</productname>
+ <productnumber>4.1</productnumber>
+ <edition>0</edition>
+ <pubsnumber>3</pubsnumber>
+ <abstract>
+ <para>
+ These release notes contain important information related to the JBoss Developer Studio. New features, known issues, resources, and other current issues are addressed here.
+ </para>
+ </abstract>
+ <corpauthor>
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" />
+ </imageobject>
+ </inlinemediaobject>
+ </corpauthor>
+ <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+</articleinfo>
14 years, 5 months