JBoss Tools SVN: r19497 - in trunk/vpe/plugins: org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2009-12-21 09:42:40 -0500 (Mon, 21 Dec 2009)
New Revision: 19497
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java
trunk/vpe/plugins/org.jboss.tools.vpe/ve/EditorOverride.css
Log:
https://jira.jboss.org/jira/browse/JBIDE-3690 fixed
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/ve/EditorOverride.css
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/ve/EditorOverride.css 2009-12-21 14:39:16 UTC (rev 19496)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/ve/EditorOverride.css 2009-12-21 14:42:40 UTC (rev 19497)
@@ -343,10 +343,10 @@
}
span.vpe-text {
- /* background :inherit !important; */
+ background :inherit !important; */
background-image:none !important;
- /* border :0px !important; */
- /* bottom :inherit !important; */
+ border :0px !important; */
+ bottom :inherit !important; */
caption-side :inherit !important;
clear :inherit !important;
clip :inherit !important;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2009-12-21 14:39:16 UTC (rev 19496)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2009-12-21 14:42:40 UTC (rev 19497)
@@ -81,8 +81,8 @@
// have drowed border. When we draw new border,
// we should remove old one;
private nsIDOMElement lastBorderedElement;
- private static final String INVISIBLE_ELEMENT_BORDER = "border: 2px solid red;";//$NON-NLS-1$
- private static final String VISIBLE_ELEMENT_BORDER = "border: 2px solid blue;";//$NON-NLS-1$
+ private static final String INVISIBLE_ELEMENT_BORDER = "border: 2px solid red !important;";//$NON-NLS-1$
+ private static final String VISIBLE_ELEMENT_BORDER = "border: 2px solid blue !important;";//$NON-NLS-1$
private static final String PREV_STYLE_ATTR_NAME = "oldstyle";//$NON-NLS-1$
/**
14 years, 4 months
JBoss Tools SVN: r19496 - trunk/smooks/plugins/org.jboss.tools.smooks.ui.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2009-12-21 09:39:16 -0500 (Mon, 21 Dec 2009)
New Revision: 19496
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/.classpath
trunk/smooks/plugins/org.jboss.tools.smooks.ui/.project
Log:
Fixing an inadvertent checkin of some linked in source artifacts
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/.classpath
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/.classpath 2009-12-21 14:07:39 UTC (rev 19495)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/.classpath 2009-12-21 14:39:16 UTC (rev 19496)
@@ -3,6 +3,5 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
- <classpathentry combineaccessrules="false" kind="src" path="/xstream"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/.project
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/.project 2009-12-21 14:07:39 UTC (rev 19495)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/.project 2009-12-21 14:39:16 UTC (rev 19496)
@@ -26,15 +26,5 @@
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<linkedResources>
- <link>
- <name>smooks-core</name>
- <type>2</type>
- <location>/Users/tfennelly/packs/eclipse/Eclipse.app/Contents/MacOS/D::/Users/tfennelly/packs/eclipse/Eclipse.app/Contents/MacOS/D::/Users/tfennelly/milyn/trunk/smooks-core/src/main/java</location>
- </link>
- <link>
- <name>smooks-csv</name>
- <type>2</type>
- <location>/Users/tfennelly/packs/eclipse/Eclipse.app/Contents/MacOS/D::/Users/tfennelly/packs/eclipse/Eclipse.app/Contents/MacOS/D::/Users/tfennelly/milyn/trunk/smooks-cartridges/csv/src/main/java</location>
- </link>
</linkedResources>
</projectDescription>
14 years, 4 months
JBoss Tools SVN: r19495 - trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2009-12-21 09:07:39 -0500 (Mon, 21 Dec 2009)
New Revision: 19495
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java
Log:
show file name fix.
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2009-12-21 13:26:33 UTC (rev 19494)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2009-12-21 14:07:39 UTC (rev 19495)
@@ -26,10 +26,16 @@
import java.util.Map.Entry;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ProjectScope;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
@@ -117,7 +123,7 @@
cPage.setFileName("hibernate.hbm.xml"); //$NON-NLS-1$
addPage( cPage );
- page2 = new NewHibernateMappingFilePage(true);
+ page2 = new NewHibernateMappingFilePage(false);
page2.setTitle(JdtUiMessages.NewHibernateMappingFilePage_hibernate_xml_mapping_file);
page2.setMessage(JdtUiMessages.NewHibernateMappingFilePage_this_wizard_creates, IMessageProvider.WARNING);
@@ -241,14 +247,19 @@
Configuration config = entry.getValue();
HibernateMappingGlobalSettings hmgs = new HibernateMappingGlobalSettings();
- IResource container;
+
try {
- container = entry.getKey().getPackageFragmentRoots().length > 0
+ IResource container = entry.getKey().getPackageFragmentRoots().length > 0
? entry.getKey().getPackageFragmentRoots()[0].getResource()
: entry.getKey().getResource();
-
+
+ IPath temp_path = entry.getKey().getProject().getLocation()
+ .append(".settings").append("org.hibernate_tools.temp");
+
+ IFolder temp_folder = entry.getKey().getProject().getFolder(new Path(".settings/org.hibernate_tools.temp"));
+
HibernateMappingExporter hce = new HibernateMappingExporter(config,
- container.getLocation().toFile());
+ temp_folder.getLocation().toFile());
hce.setGlobalSettings(hmgs);
//hce.setForEach("entity");
14 years, 4 months
JBoss Tools SVN: r19494 - trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-12-21 08:26:33 -0500 (Mon, 21 Dec 2009)
New Revision: 19494
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb12.meta
Log:
https://jira.jboss.org/jira/browse/JBIDE-5427
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2009-12-21 12:23:05 UTC (rev 19493)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2009-12-21 13:26:33 UTC (rev 19494)
@@ -1652,16 +1652,16 @@
<XActionItem kind="list" name="Separator"/>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="FTP Listener..." kind="action" name="AddFTPListener">
- <EntityData EntityName="ESBFTPListener101">
+ displayName="FS Listener..." kind="action" name="AddFSListener">
+ <EntityData EntityName="ESBFSListener101">
<AttributeData AttributeName="name"/>
<AttributeData AttributeName="channel id ref" Mandatory="no"/>
</EntityData>
</XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="FS Listener..." kind="action" name="AddFSListener">
- <EntityData EntityName="ESBFSListener101">
+ displayName="FTP Listener..." kind="action" name="AddFTPListener">
+ <EntityData EntityName="ESBFTPListener101">
<AttributeData AttributeName="name"/>
<AttributeData AttributeName="channel id ref" Mandatory="no"/>
</EntityData>
@@ -1926,84 +1926,84 @@
</EntityData>
</XActionItem>
<XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty"
- PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBJBRBus101"
- displayName="JBR Provider..." kind="action" name="AddJBRProvider">
- <EntityData EntityName="ESBJBRProvider101">
+ PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBFSBus101"
+ displayName="FS Provider..." kind="action" name="AddFSProvider">
+ <EntityData EntityName="ESBFSProvider101">
<AttributeData AttributeName="name"/>
- <AttributeData AttributeName="protocol"/>
- <AttributeData AttributeName="host" Mandatory="no"/>
</EntityData>
<EntityData EntityName="ESBBusCreator">
<AttributeData AttributeName="id"/>
- <AttributeData AttributeName="port"/>
</EntityData>
</XActionItem>
- <XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Schedule Provider..." kind="action" name="AddScheduleProvider">
- <EntityData EntityName="ESBScheduleProvider101">
- <AttributeData AttributeName="name"/>
- </EntityData>
- </XActionItem>
<XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty"
- PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBJMSBus101"
- displayName="JMS Provider..." kind="action" name="AddJMSProvider">
- <EntityData EntityName="ESBJMSProvider101">
+ PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBFTPBus101"
+ displayName="FTP Provider..." kind="action" name="AddFTPProvider">
+ <EntityData EntityName="ESBFTPProvider101">
<AttributeData AttributeName="name"/>
- <AttributeData AttributeName="connection factory"/>
+ <AttributeData AttributeName="hostname"/>
</EntityData>
<EntityData EntityName="ESBBusCreator">
<AttributeData AttributeName="id"/>
</EntityData>
</XActionItem>
<XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty"
- PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBJMSBus101"
- displayName="JCA Provider..." kind="action" name="AddJCAProvider">
- <EntityData EntityName="ESBJCAProvider101">
+ PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBHibernateBus101"
+ displayName="Hibernate Provider..." kind="action" name="AddHibernateProvider">
+ <EntityData EntityName="ESBHibernateProvider101">
<AttributeData AttributeName="name"/>
- <AttributeData AttributeName="connection factory"/>
+ <AttributeData AttributeName="hibernate cfg file"/>
</EntityData>
<EntityData EntityName="ESBBusCreator">
<AttributeData AttributeName="id"/>
</EntityData>
</XActionItem>
<XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty"
- PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBFSBus101"
- displayName="FS Provider..." kind="action" name="AddFSProvider">
- <EntityData EntityName="ESBFSProvider101">
+ PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBJBRBus101"
+ displayName="JBR Provider..." kind="action" name="AddJBRProvider">
+ <EntityData EntityName="ESBJBRProvider101">
<AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="protocol"/>
+ <AttributeData AttributeName="host" Mandatory="no"/>
</EntityData>
<EntityData EntityName="ESBBusCreator">
<AttributeData AttributeName="id"/>
+ <AttributeData AttributeName="port"/>
</EntityData>
</XActionItem>
<XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty"
- PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBFTPBus101"
- displayName="FTP Provider..." kind="action" name="AddFTPProvider">
- <EntityData EntityName="ESBFTPProvider101">
+ PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBJMSBus101"
+ displayName="JCA Provider..." kind="action" name="AddJCAProvider">
+ <EntityData EntityName="ESBJCAProvider101">
<AttributeData AttributeName="name"/>
- <AttributeData AttributeName="hostname"/>
+ <AttributeData AttributeName="connection factory"/>
</EntityData>
<EntityData EntityName="ESBBusCreator">
<AttributeData AttributeName="id"/>
</EntityData>
</XActionItem>
<XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty"
- PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBSQLBus101"
- displayName="SQL Provider..." kind="action" name="AddSQLProvider">
- <EntityData EntityName="ESBSQLProvider101">
+ PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBJMSBus101"
+ displayName="JMS Provider..." kind="action" name="AddJMSProvider">
+ <EntityData EntityName="ESBJMSProvider101">
<AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="connection factory"/>
</EntityData>
<EntityData EntityName="ESBBusCreator">
<AttributeData AttributeName="id"/>
</EntityData>
</XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Schedule Provider..." kind="action" name="AddScheduleProvider">
+ <EntityData EntityName="ESBScheduleProvider101">
+ <AttributeData AttributeName="name"/>
+ </EntityData>
+ </XActionItem>
<XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty"
- PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBHibernateBus101"
- displayName="Hibernate Provider..." kind="action" name="AddHibernateProvider">
- <EntityData EntityName="ESBHibernateProvider101">
+ PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBSQLBus101"
+ displayName="SQL Provider..." kind="action" name="AddSQLProvider">
+ <EntityData EntityName="ESBSQLProvider101">
<AttributeData AttributeName="name"/>
- <AttributeData AttributeName="hibernate cfg file"/>
</EntityData>
<EntityData EntityName="ESBBusCreator">
<AttributeData AttributeName="id"/>
@@ -2064,14 +2064,8 @@
<XActionItem ICON="action.empty" displayName="New" group="1"
kind="list" name="CreateActions">
<XActionItemReference entity="ESBProviders101" name="AddBusProvider" path="CreateActions/AddBusProvider"/>
- <XActionItemReference entity="ESBProviders101" name="AddJBRProvider" path="CreateActions/AddJBRProvider"/>
- <XActionItemReference entity="ESBProviders101"
- name="AddScheduleProvider" path="CreateActions/AddScheduleProvider"/>
- <XActionItemReference entity="ESBProviders101" name="AddJMSProvider" path="CreateActions/AddJMSProvider"/>
- <XActionItemReference entity="ESBProviders101" name="AddJCAProvider" path="CreateActions/AddJCAProvider"/>
<XActionItemReference entity="ESBProviders101" name="AddFSProvider" path="CreateActions/AddFSProvider"/>
<XActionItemReference entity="ESBProviders101" name="AddFTPProvider" path="CreateActions/AddFTPProvider"/>
- <XActionItemReference entity="ESBProviders101" name="AddSQLProvider" path="CreateActions/AddSQLProvider"/>
<XActionItemReference entity="ESBProviders101"
name="AddHibernateProvider" path="CreateActions/AddHibernateProvider"/>
<XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty"
@@ -2086,6 +2080,12 @@
<AttributeData AttributeName="id"/>
</EntityData>
</XActionItem>
+ <XActionItemReference entity="ESBProviders101" name="AddJBRProvider" path="CreateActions/AddJBRProvider"/>
+ <XActionItemReference entity="ESBProviders101" name="AddJCAProvider" path="CreateActions/AddJCAProvider"/>
+ <XActionItemReference entity="ESBProviders101" name="AddJMSProvider" path="CreateActions/AddJMSProvider"/>
+ <XActionItemReference entity="ESBProviders101"
+ name="AddScheduleProvider" path="CreateActions/AddScheduleProvider"/>
+ <XActionItemReference entity="ESBProviders101" name="AddSQLProvider" path="CreateActions/AddSQLProvider"/>
<XActionItem HIDE="always"
HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.ShowMenuHandler"
PROPERTIES="actionList=CreateActions" displayName="Provider..."
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb12.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb12.meta 2009-12-21 12:23:05 UTC (rev 19493)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb12.meta 2009-12-21 13:26:33 UTC (rev 19494)
@@ -605,9 +605,11 @@
<AttributeData AttributeName="channel id ref" Mandatory="no"/>
</EntityData>
</XActionItem>
- <XActionItem HandlerClassName="org.jboss.tools.esb.core.model.handlers.AddJBRListerer12Handler" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="JBR Listener..." kind="action" name="AddJBRListener">
+ <XActionItem
+ HandlerClassName="org.jboss.tools.esb.core.model.handlers.AddJBRListerer12Handler"
+ ICON="action.empty" PROPERTIES="validator.add=true"
+ WizardClassName="%Default%" displayName="JBR Listener..."
+ kind="action" name="AddJBRListener">
<EntityData EntityName="ESBJBRListener101">
<AttributeData AttributeName="name"/>
<AttributeData AttributeName="channel id ref" Mandatory="no"/>
@@ -747,14 +749,8 @@
<XActionItem ICON="action.empty" displayName="New" group="1"
kind="list" name="CreateActions">
<XActionItemReference entity="ESBProviders101" name="AddBusProvider" path="CreateActions/AddBusProvider"/>
- <XActionItemReference entity="ESBProviders101" name="AddJBRProvider" path="CreateActions/AddJBRProvider"/>
- <XActionItemReference entity="ESBProviders101"
- name="AddScheduleProvider" path="CreateActions/AddScheduleProvider"/>
- <XActionItemReference entity="ESBProviders101" name="AddJMSProvider" path="CreateActions/AddJMSProvider"/>
- <XActionItemReference entity="ESBProviders101" name="AddJCAProvider" path="CreateActions/AddJCAProvider"/>
<XActionItemReference entity="ESBProviders101" name="AddFSProvider" path="CreateActions/AddFSProvider"/>
<XActionItemReference entity="ESBProviders101" name="AddFTPProvider" path="CreateActions/AddFTPProvider"/>
- <XActionItemReference entity="ESBProviders101" name="AddSQLProvider" path="CreateActions/AddSQLProvider"/>
<XActionItemReference entity="ESBProviders101"
name="AddHibernateProvider" path="CreateActions/AddHibernateProvider"/>
<XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty"
@@ -767,6 +763,12 @@
<AttributeData AttributeName="id"/>
</EntityData>
</XActionItem>
+ <XActionItemReference entity="ESBProviders101" name="AddJBRProvider" path="CreateActions/AddJBRProvider"/>
+ <XActionItemReference entity="ESBProviders101" name="AddJCAProvider" path="CreateActions/AddJCAProvider"/>
+ <XActionItemReference entity="ESBProviders101" name="AddJMSProvider" path="CreateActions/AddJMSProvider"/>
+ <XActionItemReference entity="ESBProviders101"
+ name="AddScheduleProvider" path="CreateActions/AddScheduleProvider"/>
+ <XActionItemReference entity="ESBProviders101" name="AddSQLProvider" path="CreateActions/AddSQLProvider"/>
<XActionItem HIDE="always"
HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.ShowMenuHandler"
PROPERTIES="actionList=CreateActions" displayName="Provider..."
14 years, 4 months
JBoss Tools SVN: r19493 - trunk/jst/plugins/org.jboss.tools.jst.web/resources/help.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-12-21 07:23:05 -0500 (Mon, 21 Dec 2009)
New Revision: 19493
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-5541
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.properties 2009-12-21 09:36:47 UTC (rev 19492)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.properties 2009-12-21 12:23:05 UTC (rev 19493)
@@ -1,3 +1,9 @@
+IMPORT_WEB_PROJECT_WIZARD_PROJECT_LOCATION = Project Location
+IMPORT_WEB_PROJECT_SELECT_WEB_XML = Please select web.xml location
+IMPORT_WEB_PROJECT_WIZARD_PROJECT_FOLDERS = Project Folders
+IMPORT_WEB_PROJECT_SELECT_PROJECT_FOLDERS = Select Project Folders
+
+
WebPrjAdoptStepName.web.xml_location=web.xml Location
##### Some Files #####
14 years, 4 months
JBoss Tools SVN: r19492 - trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2009-12-21 04:36:47 -0500 (Mon, 21 Dec 2009)
New Revision: 19492
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/JBossESBRuntimeContainerPage.java
Log:
JBIDE-5497: refresh ESb runtime list once manageRuntime dialog is close
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/JBossESBRuntimeContainerPage.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/JBossESBRuntimeContainerPage.java 2009-12-21 09:36:39 UTC (rev 19491)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/JBossESBRuntimeContainerPage.java 2009-12-21 09:36:47 UTC (rev 19492)
@@ -149,6 +149,9 @@
FilteredPreferenceDialog dialog = WorkbenchPreferenceDialog
.createDialogOn(manageRuntimes.getShell(), "org.jboss.tools.esb.project.runtime.preference");
dialog.open();
+
+ //refresh runtime tree
+ runtimeViewer.setInput(getAllAvailableESBRuntimes());
}
public boolean finish() {
14 years, 4 months
JBoss Tools SVN: r19491 - branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2009-12-21 04:36:39 -0500 (Mon, 21 Dec 2009)
New Revision: 19491
Modified:
branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/JBossESBRuntimeContainerPage.java
Log:
JBIDE-5497: refresh ESb runtime list once manageRuntime dialog is close
Modified: branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/JBossESBRuntimeContainerPage.java
===================================================================
--- branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/JBossESBRuntimeContainerPage.java 2009-12-21 07:59:50 UTC (rev 19490)
+++ branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/JBossESBRuntimeContainerPage.java 2009-12-21 09:36:39 UTC (rev 19491)
@@ -149,6 +149,9 @@
FilteredPreferenceDialog dialog = WorkbenchPreferenceDialog
.createDialogOn(manageRuntimes.getShell(), "org.jboss.tools.esb.project.runtime.preference");
dialog.open();
+
+ //refresh runtime tree
+ runtimeViewer.setInput(getAllAvailableESBRuntimes());
}
public boolean finish() {
14 years, 4 months
JBoss Tools SVN: r19490 - in trunk/hibernatetools: plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2009-12-21 02:59:50 -0500 (Mon, 21 Dec 2009)
New Revision: 19490
Added:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/CodeGenerationReseourceNameChange.java
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/LaunchHelper.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ICodeGenerationLaunchConstants.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/ConnectionProfileRenameChange.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/HibernateRefactoringUtil.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/LaunchConfigurationResourceNameChange.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/MoveResourceParticipant.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/RenameResourceParticipant.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/RefactoringTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5499
Refactoring for hibernate code generation configuration.
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2009-12-21 07:21:33 UTC (rev 19489)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2009-12-21 07:59:50 UTC (rev 19490)
@@ -481,7 +481,7 @@
HibernateRefactoringUtil_error_during_refactoring=Error during refactoring
HibernateRefactoringUtil_error_occured_while_updating_classpath=Error occured while updating classpath.
-LaunchConfigurationResourceNameChange_update_resource_path_in_launch_cfg=Update resource path in launch configuration
+LaunchConfigurationResourceNameChange_update_resource_path_in_launch_cfg=Update resource path in launch configuration ''{0}''
MoveResourceParticipant_launch_configurations_updates=Launch Configurations updates
RenameResourceParticipant_launch_configurations_updates=Launch Configurations updates
DeleteResourceParticipant_hibernate_configurations_updates=Hibernate Configurations updates
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/LaunchHelper.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/LaunchHelper.java 2009-12-21 07:21:33 UTC (rev 19489)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/LaunchHelper.java 2009-12-21 07:59:50 UTC (rev 19490)
@@ -157,4 +157,26 @@
}
return false;
}
+
+ //***************************** Hibernate Code Generation Launch Configurations ************
+
+ public static ILaunchConfiguration[] findFilteredCodeGenerationConfigs() throws CoreException{
+ ILaunchConfiguration[] allHibernateLaunchConfigurations = findCodeGenerationConfigs();
+ List<ILaunchConfiguration> launchConfigurations = new ArrayList<ILaunchConfiguration>();
+ for (ILaunchConfiguration config : allHibernateLaunchConfigurations) {
+ if (DebugUIPlugin.doLaunchConfigurationFiltering(config)) launchConfigurations.add(config);
+ }
+ return launchConfigurations.toArray(new ILaunchConfiguration[launchConfigurations.size()]);
+ }
+
+ public static ILaunchConfiguration[] findCodeGenerationConfigs() throws CoreException {
+ ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
+ return launchManager.getLaunchConfigurations(getCodeGenerationType());
+ }
+
+ public static ILaunchConfigurationType getCodeGenerationType(){
+ ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
+ return launchManager.getLaunchConfigurationType(
+ ICodeGenerationLaunchConstants.CODE_GENERATION_LAUNCH_TYPE_ID);
+ }
}
\ No newline at end of file
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ICodeGenerationLaunchConstants.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ICodeGenerationLaunchConstants.java 2009-12-21 07:21:33 UTC (rev 19489)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ICodeGenerationLaunchConstants.java 2009-12-21 07:59:50 UTC (rev 19490)
@@ -3,6 +3,7 @@
public interface ICodeGenerationLaunchConstants {
static final String CONSOLE_CONFIGURATION_LAUNCH_TYPE_ID = "org.hibernate.eclipse.launch.ConsoleConfigurationLaunchConfigurationType"; //$NON-NLS-1$
+ static final String CODE_GENERATION_LAUNCH_TYPE_ID = "org.hibernate.eclipse.launch.CodeGenerationLaunchConfigurationType";//$NON-NLS-1$
static final int ERR_UNSPECIFIED_CONSOLE_CONFIGURATION = 1000;
static final int ERR_CONSOLE_CONFIGURATION_NOTFOUND = 1001;
static final int ERR_OUTPUT_PATH_NOTFOUND = 1002;
Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/CodeGenerationReseourceNameChange.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/CodeGenerationReseourceNameChange.java (rev 0)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/CodeGenerationReseourceNameChange.java 2009-12-21 07:59:50 UTC (rev 19490)
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.hibernate.eclipse.launch.core.refactoring;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.ltk.core.refactoring.Change;
+import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+import org.eclipse.osgi.util.NLS;
+import org.hibernate.eclipse.console.HibernateConsoleMessages;
+
+/**
+ * @author Dmitry Geraskov
+ *
+ */
+public class CodeGenerationReseourceNameChange extends Change {
+
+ private ILaunchConfiguration fLaunchConfiguration;
+ private IPath fOldPath;
+ private IPath fNewPath;
+
+ CodeGenerationReseourceNameChange(ILaunchConfiguration launchConfiguration, IPath oldPath, IPath newPath){
+ fLaunchConfiguration = launchConfiguration;
+ fOldPath = oldPath;
+ fNewPath = newPath;
+ }
+
+ @Override
+ public Object getModifiedElement() {
+ return fLaunchConfiguration;
+ }
+
+ @Override
+ public String getName() {
+ return NLS.bind(HibernateConsoleMessages.LaunchConfigurationResourceNameChange_update_resource_path_in_launch_cfg, fLaunchConfiguration.getName());
+ }
+
+ @Override
+ public void initializeValidationData(IProgressMonitor pm) { }
+
+ @Override
+ public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException,
+ OperationCanceledException {
+ return new RefactoringStatus();
+ }
+
+ @Override
+ public Change perform(IProgressMonitor pm) throws CoreException {
+ fLaunchConfiguration = HibernateRefactoringUtil.updateCodeGenerationConfig(fLaunchConfiguration, fOldPath, fNewPath);
+ return new CodeGenerationReseourceNameChange(fLaunchConfiguration, fNewPath, fOldPath);
+ }
+
+}
Property changes on: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/CodeGenerationReseourceNameChange.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/ConnectionProfileRenameChange.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/ConnectionProfileRenameChange.java 2009-12-21 07:21:33 UTC (rev 19489)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/ConnectionProfileRenameChange.java 2009-12-21 07:59:50 UTC (rev 19490)
@@ -73,9 +73,7 @@
return new RefactoringStatus();
}
- /* (non-Javadoc)
- * @see org.eclipse.ltk.core.refactoring.Change#perform(org.eclipse.core.runtime.IProgressMonitor)
- */
+ @SuppressWarnings("deprecation")
@Override
public Change perform(IProgressMonitor pm) throws CoreException {
if (fLaunchConfiguration.exists()){
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/HibernateRefactoringUtil.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/HibernateRefactoringUtil.java 2009-12-21 07:21:33 UTC (rev 19489)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/HibernateRefactoringUtil.java 2009-12-21 07:59:50 UTC (rev 19490)
@@ -15,8 +15,10 @@
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -67,37 +69,51 @@
private static final String ERROR_MESS = HibernateConsoleMessages.HibernateRefactoringUtil_error_during_refactoring;
- private static String[] pathKeys = new String[]{
+ private static String[] ccKeys = new String[]{
IConsoleConfigurationLaunchConstants.CFG_XML_FILE,
IConsoleConfigurationLaunchConstants.PROPERTY_FILE,
HibernateLaunchConstants.ATTR_TEMPLATE_DIR,
HibernateLaunchConstants.ATTR_OUTPUT_DIR,
HibernateLaunchConstants.ATTR_REVERSE_ENGINEER_SETTINGS,
};
+
+ private static String[] cgKeys = new String[]{
+ HibernateLaunchConstants.ATTR_TEMPLATE_DIR,
+ HibernateLaunchConstants.ATTR_OUTPUT_DIR,
+ HibernateLaunchConstants.ATTR_REVERSE_ENGINEER_SETTINGS,
+ };
- private static String[] pathListKeys = new String[]{
+ private static String[] ccListKeys = new String[]{
IConsoleConfigurationLaunchConstants.FILE_MAPPINGS,
};
- public static boolean isConfigurationAffected(ILaunchConfiguration config, IPath oldPath) throws CoreException{
- return isAttributesAffected(config, oldPath) || isClassPathAffected(config, oldPath);
+ public static boolean isConsoleConfigAffected(ILaunchConfiguration config, IPath oldPath) throws CoreException{
+ return isAttributesAffected(config, oldPath, ccKeys) || isListAttributesAffected(config, oldPath, ccListKeys)
+ || isClassPathAffected(config, oldPath);
}
+
+ public static boolean isCodeGenerationConfigAffected(ILaunchConfiguration config, IPath oldPath) throws CoreException{
+ return isAttributesAffected(config, oldPath, cgKeys) || isExportersAffected(config, oldPath);
+ }
- @SuppressWarnings("unchecked")
- private static boolean isAttributesAffected(ILaunchConfiguration config, IPath oldPath) throws CoreException{
+ private static boolean isAttributesAffected(ILaunchConfiguration config, IPath oldPath, String[] paths) throws CoreException{
String attrib = null;
- for (int i = 0; i < pathKeys.length; i++) {
- attrib = config.getAttribute(pathKeys[i], (String)null);
+ for (int i = 0; i < paths.length; i++) {
+ attrib = config.getAttribute(paths[i], (String)null);
if (isAttributeChanged(attrib, oldPath))
return true;
}
-
- for (int i = 0; i < pathListKeys.length; i++) {
- List<String> list = config.getAttribute(pathListKeys[i], Collections.EMPTY_LIST);
+ return false;
+ }
+
+ @SuppressWarnings("unchecked")
+ private static boolean isListAttributesAffected(ILaunchConfiguration config, IPath oldPath, String[] listPaths) throws CoreException{
+ for (int i = 0; i < listPaths.length; i++) {
+ List<String> list = config.getAttribute(listPaths[i], Collections.EMPTY_LIST);
List<String> newMappings = new ArrayList<String>();
Iterator<String> iter = list.iterator();
while ( iter.hasNext() ) {
- attrib = iter.next();
+ String attrib = iter.next();
if (isAttributeChanged(attrib, oldPath)){
return true;
}
@@ -106,7 +122,24 @@
}
return false;
}
+
+ @SuppressWarnings("unchecked")
+ private static boolean isExportersAffected(ILaunchConfiguration config,
+ IPath oldPath) throws CoreException {
+ String[] k = new String[]{"outputdir"}; //$NON-NLS-1$
+ List<String> exporterNames = config.getAttribute(HibernateLaunchConstants.ATTR_EXPORTERS, Collections.EMPTY_LIST);
+ for (String exporterName : exporterNames) {
+ Map<String, String> props = config.getAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + '.' +
+ exporterName + ".properties", new HashMap<String, String>() ); //$NON-NLS-1$
+ for (String attribute : k) {
+ if (isAttributeChanged(props.get(attribute), oldPath))
+ return true; ;
+ }
+ }
+ return false;
+ }
+
private static boolean isClassPathAffected(ILaunchConfiguration config, IPath oldPath) throws CoreException{
boolean useDefault = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, true);
if (useDefault){
@@ -152,9 +185,10 @@
}
@SuppressWarnings("unchecked")
- public static ILaunchConfiguration updateLaunchConfig(ILaunchConfiguration config, IPath oldPath, IPath newPath) throws CoreException{
+ public static ILaunchConfiguration updateConsoleConfig(ILaunchConfiguration config, IPath oldPath, IPath newPath) throws CoreException{
final ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
- updateAttributes(oldPath, newPath, wc);
+ updateAttributes(oldPath, newPath, wc, ccKeys);
+ updateListAttributes(oldPath, newPath, wc, ccListKeys);
//classpath
try {
@@ -168,14 +202,53 @@
HibernateConsolePlugin.getDefault().log( e );
}
- //JavaMigrationDelegate.updateResourceMapping(wc);
if (wc.isDirty()) {
return wc.doSave();
} else {
return config;
}
}
+
+ public static ILaunchConfiguration updateCodeGenerationConfig(ILaunchConfiguration config, IPath oldPath, IPath newPath) throws CoreException{
+ final ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
+ updateAttributes(oldPath, newPath, wc, cgKeys);
+ updateExporters(oldPath, newPath, wc);
+ if (wc.isDirty()) {
+ return wc.doSave();
+ } else {
+ return config;
+ }
+ }
+ /**
+ * @param oldPath
+ * @param newPath
+ * @param wc
+ * @throws CoreException
+ */
+ @SuppressWarnings("unchecked")
+ private static void updateExporters(IPath oldPath, IPath newPath,
+ ILaunchConfigurationWorkingCopy wc) throws CoreException {
+ String[] keys = new String[]{"outputdir"}; //$NON-NLS-1$
+ List<String> exporterNames = wc.getAttribute(HibernateLaunchConstants.ATTR_EXPORTERS, Collections.EMPTY_LIST);
+ for (String exporterName : exporterNames) {
+ String exporterProp = HibernateLaunchConstants.ATTR_EXPORTERS + '.' +
+ exporterName + ".properties";//$NON-NLS-1$
+ Map<String, String> props = wc.getAttribute(exporterProp,
+ new HashMap<String, String>() );
+ boolean isChanged = false;
+ for (String key : keys) {
+ String attrib = props.get(key);
+ if (isAttributeChanged(attrib, oldPath)){
+ attrib = getUpdatedPath(attrib, oldPath, newPath);
+ props.put(key, attrib);
+ isChanged = true;
+ }
+ }
+ if (isChanged) wc.setAttribute(exporterProp, props);
+ }
+ }
+
/*
* Use IRuntimeClasspathEntry[] and oldMementos instead of entries[i].getMemento(), because
* when resource renamed instead of internalArchive you can have externalArchive.
@@ -287,9 +360,8 @@
}
}
- @SuppressWarnings("unchecked")
private static void updateAttributes(IPath oldPath, IPath newPath,
- final ILaunchConfigurationWorkingCopy wc) throws CoreException {
+ final ILaunchConfigurationWorkingCopy wc, String[] pathKeys) throws CoreException {
String attrib = null;
for (int i = 0; i < pathKeys.length; i++) {
attrib = wc.getAttribute(pathKeys[i], (String)null);
@@ -298,7 +370,12 @@
wc.setAttribute(pathKeys[i], attrib);
}
}
-
+ }
+
+ @SuppressWarnings("unchecked")
+ private static void updateListAttributes(IPath oldPath, IPath newPath,
+ final ILaunchConfigurationWorkingCopy wc, String[] pathListKeys) throws CoreException {
+ String attrib = null;
boolean isChanged = false;
for (int i = 0; i < pathListKeys.length; i++) {
List<String> list = wc.getAttribute(pathListKeys[i], Collections.EMPTY_LIST);
@@ -334,13 +411,13 @@
return newAttribPath.toOSString();
}
- public static ILaunchConfiguration[] getAffectedLaunchConfigurations(IPath path){
+ public static ILaunchConfiguration[] getAffectedConsoleConfigs(IPath path){
ILaunchConfiguration[] configs = null;
try {
configs = LaunchHelper.findHibernateLaunchConfigs();
List<ILaunchConfiguration> list = new ArrayList<ILaunchConfiguration>();
for(int i = 0; i < configs.length && configs[i].exists(); i++) {//refactor only hibernate launch configurations
- if (HibernateRefactoringUtil.isConfigurationAffected(configs[i], path)) list.add(configs[i]);
+ if (HibernateRefactoringUtil.isConsoleConfigAffected(configs[i], path)) list.add(configs[i]);
}
configs = list.toArray(new ILaunchConfiguration[list.size()]);
}
@@ -352,6 +429,24 @@
return configs;
}
+ public static ILaunchConfiguration[] getAffectedCodeGenerationConfigs(IPath path){
+ ILaunchConfiguration[] configs = null;
+ try {
+ configs = LaunchHelper.findCodeGenerationConfigs();
+ List<ILaunchConfiguration> list = new ArrayList<ILaunchConfiguration>();
+ for(int i = 0; i < configs.length && configs[i].exists(); i++) {
+ if (HibernateRefactoringUtil.isCodeGenerationConfigAffected(configs[i], path)) list.add(configs[i]);
+ }
+ configs = list.toArray(new ILaunchConfiguration[list.size()]);
+ }
+ catch(CoreException e) {
+ configs = new ILaunchConfiguration[0];
+ HibernateConsolePlugin.getDefault().logErrorMessage( ERROR_MESS, e );
+ }
+
+ return configs;
+ }
+
public static ILaunchConfiguration[] getAffectedLaunchConfigurations(IProject project){
ILaunchConfiguration[] configs = null;
try {
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/LaunchConfigurationResourceNameChange.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/LaunchConfigurationResourceNameChange.java 2009-12-21 07:21:33 UTC (rev 19489)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/LaunchConfigurationResourceNameChange.java 2009-12-21 07:59:50 UTC (rev 19490)
@@ -22,6 +22,7 @@
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.ltk.core.refactoring.Change;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+import org.eclipse.osgi.util.NLS;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
/**
@@ -35,7 +36,7 @@
private IPath fNewPath;
/**
- * LaunchConfigurationResourceMoveChange constructor.
+ * LaunchConfigurationResourceNameChange constructor.
* @param launchConfiguration the launch configuration to modify
* @param oldPath the old Path of the resource.
* @param newPath the new Path of the resource.
@@ -57,7 +58,7 @@
* @see org.eclipse.ltk.core.refactoring.Change#getName()
*/
public String getName() {
- return HibernateConsoleMessages.LaunchConfigurationResourceNameChange_update_resource_path_in_launch_cfg + fLaunchConfiguration.getName();
+ return NLS.bind(HibernateConsoleMessages.LaunchConfigurationResourceNameChange_update_resource_path_in_launch_cfg, fLaunchConfiguration.getName());
}
/* (non-Javadoc)
@@ -73,9 +74,7 @@
return new RefactoringStatus();
}
- /* (non-Javadoc)
- * @see org.eclipse.ltk.core.refactoring.Change#perform(org.eclipse.core.runtime.IProgressMonitor)
- */
+ @SuppressWarnings("deprecation")
public Change perform(IProgressMonitor pm) throws CoreException {
if (!fLaunchConfiguration.exists()){
IWorkspace workspace = ResourcesPlugin.getWorkspace();
@@ -100,7 +99,7 @@
}
}
}
- fLaunchConfiguration = HibernateRefactoringUtil.updateLaunchConfig(fLaunchConfiguration, fOldPath, fNewPath);
+ fLaunchConfiguration = HibernateRefactoringUtil.updateConsoleConfig(fLaunchConfiguration, fOldPath, fNewPath);
return new LaunchConfigurationResourceNameChange(fLaunchConfiguration, fNewPath, fOldPath);
}
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/MoveResourceParticipant.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/MoveResourceParticipant.java 2009-12-21 07:21:33 UTC (rev 19489)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/MoveResourceParticipant.java 2009-12-21 07:59:50 UTC (rev 19490)
@@ -25,14 +25,20 @@
public Change createChange(IProgressMonitor pm) throws CoreException,
OperationCanceledException {
- ILaunchConfiguration[] configs = HibernateRefactoringUtil.getAffectedLaunchConfigurations(fResource.getFullPath());
+ ILaunchConfiguration[] configs = HibernateRefactoringUtil.getAffectedConsoleConfigs(fResource.getFullPath());
List<Change> changes = new ArrayList<Change>();
- LaunchConfigurationResourceNameChange change = null;
+ Change change = null;
for (int i= 0; i < configs.length; i++) {
change = new LaunchConfigurationResourceNameChange(configs[i], fResource.getFullPath(), ((IResource)getArguments().getDestination()).getFullPath().append(fResource.getName()));
changes.add(change);
}
+
+ configs = HibernateRefactoringUtil.getAffectedCodeGenerationConfigs(fResource.getFullPath());
+ for (int i= 0; i < configs.length; i++) {
+ change = new CodeGenerationReseourceNameChange(configs[i], fResource.getFullPath(), ((IResource)getArguments().getDestination()).getFullPath().append(fResource.getName()));
+ changes.add(change);
+ }
return HibernateRefactoringUtil.createChangesFromList(changes, getName());
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/RenameResourceParticipant.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/RenameResourceParticipant.java 2009-12-21 07:21:33 UTC (rev 19489)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/RenameResourceParticipant.java 2009-12-21 07:59:50 UTC (rev 19490)
@@ -45,15 +45,22 @@
*/
public Change createChange(IProgressMonitor pm) throws CoreException,
OperationCanceledException {
- ILaunchConfiguration[] configs = HibernateRefactoringUtil.getAffectedLaunchConfigurations(fResource.getFullPath());
+ ILaunchConfiguration[] configs = HibernateRefactoringUtil.getAffectedConsoleConfigs(fResource.getFullPath());
List<Change> changes = new ArrayList<Change>();
- LaunchConfigurationResourceNameChange change = null;
+ Change change = null;
for (int i= 0; i < configs.length; i++) {
change = new LaunchConfigurationResourceNameChange(configs[i], fResource.getFullPath(),
fResource.getParent().getFullPath().append(getArguments().getNewName()));
changes.add(change);
}
+
+ configs = HibernateRefactoringUtil.getAffectedCodeGenerationConfigs(fResource.getFullPath());
+ for (int i= 0; i < configs.length; i++) {
+ change = new CodeGenerationReseourceNameChange(configs[i], fResource.getFullPath(),
+ fResource.getParent().getFullPath().append(getArguments().getNewName()));
+ changes.add(change);
+ }
return HibernateRefactoringUtil.createChangesFromList(changes, getName());
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/RefactoringTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/RefactoringTest.java 2009-12-21 07:21:33 UTC (rev 19489)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/RefactoringTest.java 2009-12-21 07:59:50 UTC (rev 19490)
@@ -12,6 +12,7 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -37,6 +38,7 @@
import org.eclipse.jdt.internal.launching.RuntimeClasspathEntry;
import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
import org.hibernate.eclipse.console.test.project.SimpleTestProject;
+import org.hibernate.eclipse.launch.HibernateLaunchConstants;
import org.hibernate.eclipse.launch.IConsoleConfigurationLaunchConstants;
import org.hibernate.eclipse.launch.core.refactoring.HibernateRefactoringUtil;
@@ -47,6 +49,8 @@
@SuppressWarnings("restriction")
public class RefactoringTest extends TestCase {
+ private static final String HBMTEMPLATE0 = "hbmtemplate0";
+ private static final String HBMTEMPLATE0_PROPERTIES = HibernateLaunchConstants.ATTR_EXPORTERS + '.' + HBMTEMPLATE0 + ".properties";
private final String[] oldPathElements = new String[]{"oldPrj","oldSrc", "oldPack", "oldHibernate.cfg.xml"}; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
private final String[] newPathElements = new String[]{"newPrj","newSrc", "newPack", "newHibernate.cfg.xml"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
@@ -55,6 +59,8 @@
private TestLaunchConfig testStrConfig = null;
private TestLaunchConfig testStrListConfig = null;
private TestLaunchConfig testNotChangedConfig = null;
+ private TestLaunchConfig testCodeGenerationConfig = null;
+ private TestLaunchConfig testNotChangedCodeGenerationConfig = null;
private IRuntimeClasspathEntry[] runtimeClasspathEntries = null;
@@ -73,6 +79,8 @@
Map<String, Object> testStrAttr = new HashMap<String, Object>();
Map<String, Object> testStrListAttr = new HashMap<String, Object>();
Map<String, Object> testNotChangedAttr = new HashMap<String, Object>();
+ Map<String, Object> testCodeGenerationAttr = new HashMap<String, Object>();
+ Map<String, Object> testNotChangedCodeGenerationAttr = new HashMap<String, Object>();
testStrAttr.put(IConsoleConfigurationLaunchConstants.CFG_XML_FILE, oldPathStr);
@@ -81,9 +89,29 @@
testNotChangedAttr.put(IConsoleConfigurationLaunchConstants.CFG_XML_FILE, notChangedPathStr);
testNotChangedAttr.put(IConsoleConfigurationLaunchConstants.FILE_MAPPINGS, Arrays.asList(new String[]{notChangedPathStr}));
+ testCodeGenerationAttr.put(HibernateLaunchConstants.ATTR_TEMPLATE_DIR, generateOldPathForSegment(2).toString());
+ testCodeGenerationAttr.put(HibernateLaunchConstants.ATTR_OUTPUT_DIR, generateOldPathForSegment(2).toString());
+ testCodeGenerationAttr.put(HibernateLaunchConstants.ATTR_REVERSE_ENGINEER_SETTINGS, oldPathStr.toString());
+ testCodeGenerationAttr.put(HibernateLaunchConstants.ATTR_EXPORTERS, Collections.singletonList(HBMTEMPLATE0));
+ Map<String, String> expProps = new HashMap<String, String>();
+ expProps.put("outputdir", generateOldPathForSegment(2).toString());
+ testCodeGenerationAttr.put(HBMTEMPLATE0_PROPERTIES, expProps);
+
+ testNotChangedCodeGenerationAttr.put(HibernateLaunchConstants.ATTR_TEMPLATE_DIR, notChangedPathStr.toString());
+ testNotChangedCodeGenerationAttr.put(HibernateLaunchConstants.ATTR_OUTPUT_DIR, notChangedPathStr.toString());
+ testNotChangedCodeGenerationAttr.put(HibernateLaunchConstants.ATTR_REVERSE_ENGINEER_SETTINGS, notChangedPathStr.toString());
+ testCodeGenerationAttr.put(HibernateLaunchConstants.ATTR_EXPORTERS, Collections.singletonList(HBMTEMPLATE0));
+ Map<String, String> expProps2 = new HashMap<String, String>();
+ expProps2.put("outputdir", generateOldPathForSegment(2).toString());
+ testNotChangedCodeGenerationAttr.put(HBMTEMPLATE0_PROPERTIES, expProps2);
+
+
testStrConfig = new TestLaunchConfig(testStrAttr);
testStrListConfig = new TestLaunchConfig(testStrListAttr);
testNotChangedConfig = new TestLaunchConfig(testNotChangedAttr);
+ testCodeGenerationConfig = new TestLaunchConfig(testCodeGenerationAttr);
+ testNotChangedCodeGenerationConfig = new TestLaunchConfig(testNotChangedCodeGenerationAttr);
+
project = new SimpleTestProject(oldPathElements[0]);
IJavaProject proj = project.getIJavaProject();
@@ -108,9 +136,11 @@
for (int i = 0; i < oldPathElements.length - 1; i++) {
IPath oldPathPart = generateOldPathForSegment(i);
try {
- assertTrue(HibernateRefactoringUtil.isConfigurationAffected(testStrConfig, oldPathPart));
- assertTrue(HibernateRefactoringUtil.isConfigurationAffected(testStrListConfig, oldPathPart));
- assertFalse(HibernateRefactoringUtil.isConfigurationAffected(testNotChangedConfig, oldPathPart));
+ assertTrue(HibernateRefactoringUtil.isConsoleConfigAffected(testStrConfig, oldPathPart));
+ assertTrue(HibernateRefactoringUtil.isConsoleConfigAffected(testStrListConfig, oldPathPart));
+ assertFalse(HibernateRefactoringUtil.isConsoleConfigAffected(testNotChangedConfig, oldPathPart));
+ assertTrue(HibernateRefactoringUtil.isCodeGenerationConfigAffected(testCodeGenerationConfig, oldPathPart));
+ assertFalse(HibernateRefactoringUtil.isConsoleConfigAffected(testNotChangedCodeGenerationConfig, oldPathPart));
} catch (CoreException e) {
fail(ConsoleTestMessages.RefactoringTest_exception_while_findchange_launch_config_processing + e.getMessage());
}
@@ -147,7 +177,9 @@
int segmentNum = 0;
try {
updatePaths(generateOldPathForSegment(segmentNum), generateNewPathForSegment(segmentNum));
- checkPaths(generateTruePathForSegment(segmentNum));
+ Path truePath = generateTruePathForSegment(segmentNum);
+ checkPaths(truePath);
+ checkAdditional(truePath);
} catch (CoreException e) {
fail(ConsoleTestMessages.RefactoringTest_exception_while_projnamechange_refactor);
}
@@ -157,7 +189,9 @@
int segmentNum = 1;
try {
updatePaths(generateOldPathForSegment(segmentNum), generateNewPathForSegment(segmentNum));
- checkPaths(generateTruePathForSegment(segmentNum));
+ Path truePath = generateTruePathForSegment(segmentNum);
+ checkPaths(truePath);
+ checkAdditional(truePath);
} catch (CoreException e) {
fail(ConsoleTestMessages.RefactoringTest_exception_while_srcnamechange_refactor);
}
@@ -167,7 +201,9 @@
int segmentNum = 2;
try {
updatePaths(generateOldPathForSegment(segmentNum), generateNewPathForSegment(segmentNum));
- checkPaths(generateTruePathForSegment(segmentNum));
+ Path truePath = generateTruePathForSegment(segmentNum);
+ checkPaths(truePath);
+ checkAdditional(truePath);
} catch (CoreException e) {
fail(ConsoleTestMessages.RefactoringTest_exception_while_packnamechange_refactor);
}
@@ -199,8 +235,9 @@
}
private void updatePaths(Path oldPath, Path newPath) throws CoreException{
- HibernateRefactoringUtil.updateLaunchConfig(testStrConfig, oldPath, newPath);
- HibernateRefactoringUtil.updateLaunchConfig(testStrListConfig, oldPath, newPath);
+ HibernateRefactoringUtil.updateConsoleConfig(testStrConfig, oldPath, newPath);
+ HibernateRefactoringUtil.updateConsoleConfig(testStrListConfig, oldPath, newPath);
+ HibernateRefactoringUtil.updateCodeGenerationConfig(testCodeGenerationConfig, oldPath, newPath);
}
private void checkMementoChanged(String oldMemento, String newMemento, IPath oldPathPart, IPath newPath){
@@ -244,7 +281,21 @@
assertEquals(truePath.makeAbsolute(), new Path(newPath).makeAbsolute());
newPath = ((List<String>) testStrListConfig.getNewAttribute(IConsoleConfigurationLaunchConstants.FILE_MAPPINGS)).get(0);
assertEquals(truePath.makeAbsolute(), new Path(newPath).makeAbsolute());
+
+ newPath = (String) testCodeGenerationConfig.getNewAttribute(HibernateLaunchConstants.ATTR_REVERSE_ENGINEER_SETTINGS);
+ assertEquals(truePath.makeAbsolute(), new Path(newPath).makeAbsolute());
}
+
+ @SuppressWarnings("unchecked")
+ private void checkAdditional(Path truePath) throws CoreException {
+ String newPath = (String) testCodeGenerationConfig.getNewAttribute(HibernateLaunchConstants.ATTR_TEMPLATE_DIR);
+ assertEquals(truePath.removeLastSegments(1).makeAbsolute(), new Path(newPath).makeAbsolute());
+ newPath = (String) testCodeGenerationConfig.getNewAttribute(HibernateLaunchConstants.ATTR_OUTPUT_DIR);
+ assertEquals(truePath.removeLastSegments(1).makeAbsolute(), new Path(newPath).makeAbsolute());
+ Map<String, String> props = testCodeGenerationConfig.getAttribute(HBMTEMPLATE0_PROPERTIES,
+ new HashMap<String, String>());
+ assertEquals(truePath.removeLastSegments(1).makeAbsolute(), new Path(props.get("outputdir")).makeAbsolute());
+ }
private Path generateNewPathForSegment(int segmentNum){
assertTrue(ConsoleTestMessages.RefactoringTest_segmentnum_too_match, segmentNum < oldPathElements.length);
@@ -333,7 +384,9 @@
attributes.put(attributeName, value);
}
- public void setAttribute(String attributeName, Map value) {fail(ConsoleTestMessages.RefactoringTest_method_not_tested);}
+ public void setAttribute(String attributeName, Map value) {
+ attributes.put(attributeName, value);
+ }
public void setAttribute(String attributeName, boolean value) {fail(ConsoleTestMessages.RefactoringTest_method_not_tested);}
@@ -387,8 +440,7 @@
public Map getAttribute(String attributeName, Map defaultValue)
throws CoreException {
- fail(ConsoleTestMessages.RefactoringTest_method_not_tested);
- return null;
+ return parent.getAttribute(attributeName, defaultValue);
}
public String getAttribute(String attributeName, String defaultValue)
@@ -559,7 +611,11 @@
public Map getAttribute(String attributeName, Map defaultValue)
throws CoreException {
- return null;
+ if (attributes.containsKey(attributeName)){
+ return (Map) attributes.get(attributeName);
+ } else {
+ return defaultValue;
+ }
}
public String getAttribute(String attributeName, String defaultValue)
14 years, 4 months
JBoss Tools SVN: r19489 - trunk/as/plugins/org.jboss.ide.eclipse.as.core.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2009-12-21 02:21:33 -0500 (Mon, 21 Dec 2009)
New Revision: 19489
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
Log:
JBIDE-5506: fix the "Invalid matching rules used: 4.7/4 " error
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2009-12-21 07:17:42 UTC (rev 19488)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2009-12-21 07:21:33 UTC (rev 19489)
@@ -230,7 +230,7 @@
versions="1.0"/>
<moduleType
types="jst.jboss.esb"
- versions="4.2,4.3,4.4,4.5,4,6,4.7">
+ versions="4.2,4.3,4.4,4.5,4.6,4.7">
</moduleType>
</runtimeType>
<runtimeType
@@ -263,7 +263,7 @@
versions="1.0"/>
<moduleType
types="jst.jboss.esb"
- versions="4.2,4.3,4.4,4.5,4,6,4.7">
+ versions="4.2,4.3,4.4,4.5,4.6,4.7">
</moduleType>
<moduleType
types="jbt.bpel.module"
14 years, 4 months
JBoss Tools SVN: r19488 - branches/jbosstools-3.1.0.RC1/as/plugins/org.jboss.ide.eclipse.as.core.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2009-12-21 02:17:42 -0500 (Mon, 21 Dec 2009)
New Revision: 19488
Modified:
branches/jbosstools-3.1.0.RC1/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
Log:
JBIDE-5506:fix the "Invalid matching rules used: 4.7/4 " error
Modified: branches/jbosstools-3.1.0.RC1/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- branches/jbosstools-3.1.0.RC1/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2009-12-20 19:12:42 UTC (rev 19487)
+++ branches/jbosstools-3.1.0.RC1/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2009-12-21 07:17:42 UTC (rev 19488)
@@ -230,7 +230,7 @@
versions="1.0"/>
<moduleType
types="jst.jboss.esb"
- versions="4.2,4.3,4.4,4.5,4,6,4.7">
+ versions="4.2,4.3,4.4,4.5,4.6,4.7">
</moduleType>
</runtimeType>
<runtimeType
@@ -263,7 +263,7 @@
versions="1.0"/>
<moduleType
types="jst.jboss.esb"
- versions="4.2,4.3,4.4,4.5,4,6,4.7">
+ versions="4.2,4.3,4.4,4.5,4.6,4.7">
</moduleType>
<moduleType
types="jbt.bpel.module"
14 years, 4 months