JBoss Tools SVN: r25581 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-07 16:53:53 -0400 (Thu, 07 Oct 2010)
New Revision: 25581
Modified:
trunk/build/publish.sh
Log:
typo
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-10-07 20:10:51 UTC (rev 25580)
+++ trunk/build/publish.sh 2010-10-07 20:53:53 UTC (rev 25581)
@@ -63,7 +63,7 @@
# ...
# At revision 25538
rl=${STAGINGDIR}/logs/SVN_REVISION.txt
-sed -ne "/Updating http.\+\|Checking out http.\+\|At revision \d\+/ p" ${bl} " > ${rl}
+sed -ne "/Updating \(http.\+\)\|Checking out \(http.\+\)\|At revision \(\d\+\)/" ${bl} > ${rl}
METAFILE="${BUILD_ID}-H${BUILD_NUMBER}.txt"
if [[ ${SVN_REVISION} ]]; then
13 years, 9 months
JBoss Tools SVN: r25580 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-07 16:10:51 -0400 (Thu, 07 Oct 2010)
New Revision: 25580
Modified:
trunk/build/target-platform/e361-wtp322.target
Log:
add ./features/org.eclipse.tptp.platform.xerces_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar to target
Modified: trunk/build/target-platform/e361-wtp322.target
===================================================================
--- trunk/build/target-platform/e361-wtp322.target 2010-10-07 19:33:14 UTC (rev 25579)
+++ trunk/build/target-platform/e361-wtp322.target 2010-10-07 20:10:51 UTC (rev 25580)
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?><?pde version="3.6"?>
<target includeMode="feature" name="e36-wtp32">
+ <!-- Pro tip: to convert
+ from org.eclipse.tptp.platform.xerces_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar
+ to <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.tptp.platform.xerces.feature.group"/>
+ using vi, apply this transform:
+ :%s/\t\t\(org.\+\)_\(\d\+.\+\)\.jar/\t\t<unit version="\2" id="\1.feature.group"\/>/g
+ -->
<locations>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit version="0.10.2.20100623-1649" id="org.maven.ide.eclipse.feature.feature.group"/>
@@ -52,6 +58,8 @@
<unit version="4.7.1.v201009092123-8X8ZFXUFLWUl6knOxRCm9t" id="org.eclipse.tptp.platform.core.feature.group"/>
<unit version="4.5.1.v201009092123-797A18s73533L4F6D6D" id="org.eclipse.tptp.platform.jvmti.feature.group"/>
<unit version="4.5.1.v201009092123-7L7O8bBgJ9E99jAfGWEM" id="org.eclipse.tptp.platform.trace.feature.group"/>
+ <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.tptp.platform.xerces.feature.group"/>
+
<repository location="http://download.eclipse.org/tptp/updates/helios/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
@@ -203,4 +211,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>
13 years, 9 months
JBoss Tools SVN: r25579 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors.
by jbosstools-commits＠lists.jboss.org
Author: tfennelly
Date: 2010-10-07 15:33:14 -0400 (Thu, 07 Oct 2010)
New Revision: 25579
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java
Log:
https://jira.jboss.org/browse/JBIDE-7098
Expand source and target models on opening of task panel
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2010-10-07 18:56:12 UTC (rev 25578)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2010-10-07 19:33:14 UTC (rev 25579)
@@ -952,7 +952,10 @@
if(((TaskType) parentTask).getId().equals(TaskTypeManager.TASK_ID_INPUT) && !taskType.getId().equals(TaskTypeManager.TASK_ID_JAVA_MAPPING)) {
for (AbstractSmooksGraphicalModel abstractSmooksGraphicalModel : children) {
if (abstractSmooksGraphicalModel instanceof InputDataContianerModel) {
- createConnection(abstractSmooksGraphicalModel);
+ Collection<TreeNodeConnection> c = createConnection(abstractSmooksGraphicalModel);
+ if (c != null) {
+ connections.addAll(c);
+ }
break;
}
}
13 years, 9 months
JBoss Tools SVN: r25578 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-07 14:56:12 -0400 (Thu, 07 Oct 2010)
New Revision: 25578
Modified:
trunk/build/target-platform/build.xml
trunk/build/target-platform/e361-wtp322.target
trunk/build/target-platform/e361-wtp322.target.p2mirror.xml
Log:
add more TPTP features and parameterize target.platorm.URL
Modified: trunk/build/target-platform/build.xml
===================================================================
--- trunk/build/target-platform/build.xml 2010-10-07 18:43:57 UTC (rev 25577)
+++ trunk/build/target-platform/build.xml 2010-10-07 18:56:12 UTC (rev 25578)
@@ -34,6 +34,8 @@
</condition>
<!-- if can't calculate where build/build.xml is located, must pass in path from parent when calling this script -->
+ <property name="repoDir" value="${WORKINGDIR}/REPO"/>
+
<target name="all" depends="build.local.target.platform.repo, test.local.target.platform.repo"/>
<target name="build.local.target.platform.repo" depends="init, get.arch, get.eclipse, gen.p2mirror.script, run.p2mirror.script, cleanup" />
@@ -100,7 +102,7 @@
<target name="run.p2mirror.script" description="build target update site using p2.mirror">
<exec executable="${WORKINGDIR}/eclipse/eclipse" dir="${basedir}">
<arg line=" -nosplash -data ${tmpdir}/workspace -consolelog -application org.eclipse.ant.core.antRunner" />
- <arg line=" -f ${targetFile}.p2mirror.xml -DfollowStrict=true -DrepoDir=${WORKINGDIR}/REPO/" />
+ <arg line=" -f ${targetFile}.p2mirror.xml -DfollowStrict=true -DrepoDir=${repoDir}" />
<arg line=" -Ddebug=true" />
</exec>
</target>
@@ -111,7 +113,10 @@
<target name="test.local.target.platform.repo" description="test target platform completeness by running a build against it">
<exec executable="/opt/maven3/bin/mvn" dir="${WORKINGDIR}">
- <arg line=" -f ../pom.xml clean install -B -U -fae -e -P helios-local-target,!helios -Dmaven.test.skip"/>
+ <arg line=" -f ../parent/pom.xml clean install -B -U -fae -e -P helios-local-target,!helios -Dmaven.test.skip -Dtarget.platorm.URL=file:/${repoDir}"/>
</exec>
+ <exec executable="/opt/maven3/bin/mvn" dir="${WORKINGDIR}">
+ <arg line=" -f ../pom.xml clean install -B -U -fae -e -P helios-local-target,!helios -Dmaven.test.skip -Dtarget.platorm.URL=file:/${repoDir}"/>
+ </exec>
</target>
</project>
Modified: trunk/build/target-platform/e361-wtp322.target
===================================================================
--- trunk/build/target-platform/e361-wtp322.target 2010-10-07 18:43:57 UTC (rev 25577)
+++ trunk/build/target-platform/e361-wtp322.target 2010-10-07 18:56:12 UTC (rev 25578)
@@ -48,7 +48,11 @@
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit version="4.5.1.v201009092123-7H7F2AkF7B77c7dEGDG" id="org.eclipse.tptp.platform.profile.server.feature.group"/>
- <repository location="http://download.eclipse.org/tptp/updates/"/>
+ <unit version="4.3.1.v201009092123-797908s73533D4H6D56" id="org.eclipse.tptp.platform.instrumentation.ui.feature.group"/>
+ <unit version="4.7.1.v201009092123-8X8ZFXUFLWUl6knOxRCm9t" id="org.eclipse.tptp.platform.core.feature.group"/>
+ <unit version="4.5.1.v201009092123-797A18s73533L4F6D6D" id="org.eclipse.tptp.platform.jvmti.feature.group"/>
+ <unit version="4.5.1.v201009092123-7L7O8bBgJ9E99jAfGWEM" id="org.eclipse.tptp.platform.trace.feature.group"/>
+ <repository location="http://download.eclipse.org/tptp/updates/helios/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit version="2.6.1.v20100914-1218" id="org.eclipse.emf.ecore.feature.group"/>
Modified: trunk/build/target-platform/e361-wtp322.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/e361-wtp322.target.p2mirror.xml 2010-10-07 18:43:57 UTC (rev 25577)
+++ trunk/build/target-platform/e361-wtp322.target.p2mirror.xml 2010-10-07 18:56:12 UTC (rev 25578)
@@ -37,7 +37,7 @@
<repository location="http://download.jboss.org/jbosstools/updates/requirements/thirdparty/"/>
<repository location="http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.1.2/"/>
<repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/>
-<repository location="http://download.eclipse.org/tptp/updates/"/>
+<repository location="http://download.eclipse.org/tptp/updates/helios/"/>
<repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.6/R201009141218/"/>
<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
<repository location="http://download.eclipse.org/birt/update-site/2.6/"/>
@@ -58,6 +58,10 @@
<iu version="" id="org.mozilla.xulrunner.feature.feature.group"/>
<iu version="" id="org.mozilla.xpcom.feature.feature.group"/>
<iu version="" id="org.eclipse.tptp.platform.profile.server.feature.group"/>
+<iu version="" id="org.eclipse.tptp.platform.instrumentation.ui.feature.group"/>
+<iu version="" id="org.eclipse.tptp.platform.core.feature.group"/>
+<iu version="" id="org.eclipse.tptp.platform.jvmti.feature.group"/>
+<iu version="" id="org.eclipse.tptp.platform.trace.feature.group"/>
<iu version="" id="org.eclipse.emf.ecore.feature.group"/>
<iu version="" id="org.eclipse.emf.feature.group"/>
<iu version="" id="org.eclipse.emf.codegen.feature.group"/>
13 years, 9 months
JBoss Tools SVN: r25577 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-10-07 14:43:57 -0400 (Thu, 07 Oct 2010)
New Revision: 25577
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ModuleDeploymentPage.java
Log:
https://jira.jboss.org/browse/JBIDE-6081 Overall scrolling for 'Deployment' tab in JBoss AS Server configuration editor
- removed useless additional composite inside form
- added form.reflow(true) to to the end of ModuleDeploymentPagecreate.PartControl(Composite parent) to make ScrollableForm be aware of added element
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ModuleDeploymentPage.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ModuleDeploymentPage.java 2010-10-07 18:33:22 UTC (rev 25576)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ModuleDeploymentPage.java 2010-10-07 18:43:57 UTC (rev 25577)
@@ -103,21 +103,18 @@
public void createPartControl(Composite parent) {
preferences = DeploymentPreferenceLoader.loadPreferencesFromServer(server.getOriginal());
- Composite innerContent = createPageStructure(parent);
- addDeploymentLocationControls(innerContent, null);
+ ScrolledForm innerContent = createPageStructure(parent);
+ addDeploymentLocationControls(innerContent.getBody(), null);
+ innerContent.reflow(true);
}
- private Composite createPageStructure(Composite parent) {
+ private ScrolledForm createPageStructure(Composite parent) {
FormToolkit toolkit = getFormToolkit(parent);
ScrolledForm allContent = toolkit.createScrolledForm(parent);
toolkit.decorateFormHeading(allContent.getForm());
allContent.setText("Deployment");
- allContent.getBody().setLayout(new GridLayout());
- Composite random = new Composite(allContent.getBody(), SWT.NONE);
- GridData randomData = new GridData(GridData.FILL_BOTH);
- random.setLayoutData(randomData);
- random.setLayout(new FormLayout());
- return random;
+ allContent.getBody().setLayout(new FormLayout());
+ return allContent;
}
private void addDeploymentLocationControls(Composite parent, Control top) {
@@ -142,9 +139,7 @@
fd.bottom = new FormAttachment(100, -5);
viewComposite.setLayoutData(fd);
}
-
-
-
+
public void execute(ServerCommand command) {
commandManager.execute(command);
}
13 years, 9 months
JBoss Tools SVN: r25576 - in trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp: jspeditor and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-10-07 14:33:22 -0400 (Thu, 07 Oct 2010)
New Revision: 25576
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/handlers/I18Handler.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java
Log:
Fixed compilation problems
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/handlers/I18Handler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/handlers/I18Handler.java 2010-10-07 17:27:08 UTC (rev 25575)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/handlers/I18Handler.java 2010-10-07 18:33:22 UTC (rev 25576)
@@ -122,7 +122,6 @@
return null;
}
- @Override
public void updateElement(UIElement element, Map parameters) {
fireHandlerChanged(new HandlerEvent(this, true, false));
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 2010-10-07 17:27:08 UTC (rev 25575)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2010-10-07 18:33:22 UTC (rev 25576)
@@ -142,7 +142,6 @@
//added by Maksim Areshkau, notified externalize command that selection changed
private ISelectionChangedListener externalizeSelectionChangeListener = new ISelectionChangedListener() {
- @Override
public void selectionChanged(SelectionChangedEvent event) {
ICommandService commandService = (ICommandService) PlatformUI
.getWorkbench().getService(ICommandService.class);
13 years, 9 months
JBoss Tools SVN: r25575 - in trunk/ws/plugins: org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2010-10-07 13:27:08 -0400 (Thu, 07 Oct 2010)
New Revision: 25575
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizard.java
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizardValidator.java
Log:
JBIDE-6831: cannot create sample web service with an existing name in a different package
https://jira.jboss.org/browse/JBIDE-6831 - now we check for the fully qualified path name with the class and package in it instead of just looking for a particular file name without the package
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2010-10-07 17:15:09 UTC (rev 25574)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2010-10-07 17:27:08 UTC (rev 25575)
@@ -75,6 +75,7 @@
"synchronized", "this", "throw", "throws", "transient", "true", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
"try", "void", "volatile", "while" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
static final String WEBINF = "WEB-INF"; //$NON-NLS-1$
+ private static String JAVA = ".java"; //$NON-NLS-1$
public static boolean isJavaKeyword(String keyword) {
if (hasUpperCase(keyword)) {
@@ -445,6 +446,30 @@
return path;
}
+ public static String composeSrcPackageClassPath ( IProject project, String packageName, String className) {
+ String classFilePath = null;
+ try {
+ String srcPath = JBossWSCreationUtils.getJavaProjectSrcLocation(project);
+ if (srcPath != null && srcPath.trim().length() > 0) {
+ String pathSeparator = "" + File.separatorChar; //$NON-NLS-1$
+ String packageToFolderPath = packageName.replace(".", pathSeparator); //$NON-NLS-1$
+ classFilePath = srcPath + pathSeparator + packageToFolderPath + pathSeparator + className + JAVA;
+ return classFilePath;
+ }
+ } catch (JavaModelException e) {
+ return null;
+ }
+ return null;
+
+ }
+
+ public static File findFileByPath(String path) {
+ File file = new File(path);
+ if (file.exists())
+ return file;
+ return null;
+ }
+
public static File findFileByPath(String name, String path) {
File ret = null;
File folder = new File(path);
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizard.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizard.java 2010-10-07 17:15:09 UTC (rev 25574)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizard.java 2010-10-07 17:27:08 UTC (rev 25575)
@@ -87,8 +87,14 @@
model.setUpdateWebxml(true);
model.setCustomPackage(getPackageName());
- File file = JBossWSCreationUtils.findFileByPath(getClassName() + JAVA, project
- .getLocation().toOSString());
+ String classFilePath =
+ JBossWSCreationUtils.composeSrcPackageClassPath(project, model.getCustomPackage(), className);
+ File file = null;
+ if (classFilePath != null)
+ file = JBossWSCreationUtils.findFileByPath(classFilePath);
+ else
+ file = JBossWSCreationUtils.findFileByPath(className + JAVA,
+ project.getLocation().toOSString());
if (file != null) {
MessageDialog
.openError(
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizardValidator.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizardValidator.java 2010-10-07 17:15:09 UTC (rev 25574)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizardValidator.java 2010-10-07 17:27:08 UTC (rev 25575)
@@ -160,7 +160,13 @@
if (status != null && status.getSeverity() == IStatus.ERROR) {
return status;
}
- File file = JBossWSCreationUtils.findFileByPath(className + JAVA,
+ String classFilePath =
+ JBossWSCreationUtils.composeSrcPackageClassPath(project, model.getCustomPackage(), className);
+ File file = null;
+ if (classFilePath != null)
+ file = JBossWSCreationUtils.findFileByPath(classFilePath);
+ else
+ file = JBossWSCreationUtils.findFileByPath(className + JAVA,
project.getLocation().toOSString());
if (file != null) {
// class already exists
13 years, 9 months
JBoss Tools SVN: r25574 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-10-07 13:15:09 -0400 (Thu, 07 Oct 2010)
New Revision: 25574
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterFactory.java
Log:
https://jira.jboss.org/browse/JBIDE-7280
fixed special exporter settings problems
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterFactory.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterFactory.java 2010-10-07 17:14:36 UTC (rev 25573)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterFactory.java 2010-10-07 17:15:09 UTC (rev 25574)
@@ -184,7 +184,7 @@
Properties props = new Properties();
props.putAll(globalProps);
props.putAll(getProperties());
- extractExporterProperties(exporterId, props, extract);
+ extractExporterProperties(getExporterDefinitionId(), props, extract);
String outputPath = defOutDir;
if (extract.containsKey(ExporterFactoryStrings.OUTPUTDIR)) {
outputPath = extract.getProperty(ExporterFactoryStrings.OUTPUTDIR);
@@ -216,7 +216,7 @@
exporter.setProperties(props);
exporter.setArtifactCollector(collector);
- extractExporterProperties(exporterId, props, extract);
+ extractExporterProperties(getExporterDefinitionId(), props, extract);
String outputPath = defaultOutputDirectory;
if (extract.containsKey(ExporterFactoryStrings.OUTPUTDIR)) {
@@ -278,20 +278,20 @@
}
exporter.setTemplatePath(templatePathList.toArray(new String[templatePathList.size()]));
// special handling for GenericExporter (TODO: be delegated via plugin.xml)
- if (exporterId.equals("org.hibernate.tools.hbmtemplate")) { //$NON-NLS-1$
+ if (getExporterDefinitionId().equals("org.hibernate.tools.hbmtemplate")) { //$NON-NLS-1$
GenericExporter ge = (GenericExporter) exporter;
ge.setFilePattern(extract.getProperty(ExporterFactoryStrings.FILE_PATTERN));
ge.setTemplateName(extract.getProperty(ExporterFactoryStrings.TEMPLATE_NAME));
ge.setForEach(extract.getProperty(ExporterFactoryStrings.FOR_EACH));
}
// special handling for Hbm2DDLExporter
- if (exporterId.equals("org.hibernate.tools.hbm2ddl")) { //$NON-NLS-1$
+ if (getExporterDefinitionId().equals("org.hibernate.tools.hbm2ddl")) { //$NON-NLS-1$
Hbm2DDLExporter ddlExporter = (Hbm2DDLExporter) exporter;
//avoid users to delete their databases with a single click
ddlExporter.setExport(Boolean.getBoolean(extract.getProperty(ExporterFactoryStrings.EXPORTTODATABASE)));
}
// special handling for QueryExporter
- if (exporterId.equals("org.hibernate.tools.query")) { //$NON-NLS-1$
+ if (getExporterDefinitionId().equals("org.hibernate.tools.query")) { //$NON-NLS-1$
QueryExporter queryExporter = (QueryExporter) exporter;
List<String> queryStrings = new ArrayList<String>();
queryStrings.add(extract.getProperty(ExporterFactoryStrings.QUERY_STRING));
13 years, 9 months
JBoss Tools SVN: r25573 - branches/jbosstools-3.2.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-10-07 13:14:36 -0400 (Thu, 07 Oct 2010)
New Revision: 25573
Modified:
branches/jbosstools-3.2.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterFactory.java
Log:
https://jira.jboss.org/browse/JBIDE-7280
fixed special exporter settings problems
Modified: branches/jbosstools-3.2.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterFactory.java
===================================================================
--- branches/jbosstools-3.2.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterFactory.java 2010-10-07 17:09:32 UTC (rev 25572)
+++ branches/jbosstools-3.2.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterFactory.java 2010-10-07 17:14:36 UTC (rev 25573)
@@ -184,7 +184,7 @@
Properties props = new Properties();
props.putAll(globalProps);
props.putAll(getProperties());
- extractExporterProperties(exporterId, props, extract);
+ extractExporterProperties(getExporterDefinitionId(), props, extract);
String outputPath = defOutDir;
if (extract.containsKey(ExporterFactoryStrings.OUTPUTDIR)) {
outputPath = extract.getProperty(ExporterFactoryStrings.OUTPUTDIR);
@@ -216,7 +216,7 @@
exporter.setProperties(props);
exporter.setArtifactCollector(collector);
- extractExporterProperties(exporterId, props, extract);
+ extractExporterProperties(getExporterDefinitionId(), props, extract);
String outputPath = defaultOutputDirectory;
if (extract.containsKey(ExporterFactoryStrings.OUTPUTDIR)) {
@@ -278,20 +278,20 @@
}
exporter.setTemplatePath(templatePathList.toArray(new String[templatePathList.size()]));
// special handling for GenericExporter (TODO: be delegated via plugin.xml)
- if (exporterId.equals("org.hibernate.tools.hbmtemplate")) { //$NON-NLS-1$
+ if (getExporterDefinitionId().equals("org.hibernate.tools.hbmtemplate")) { //$NON-NLS-1$
GenericExporter ge = (GenericExporter) exporter;
ge.setFilePattern(extract.getProperty(ExporterFactoryStrings.FILE_PATTERN));
ge.setTemplateName(extract.getProperty(ExporterFactoryStrings.TEMPLATE_NAME));
ge.setForEach(extract.getProperty(ExporterFactoryStrings.FOR_EACH));
}
// special handling for Hbm2DDLExporter
- if (exporterId.equals("org.hibernate.tools.hbm2ddl")) { //$NON-NLS-1$
+ if (getExporterDefinitionId().equals("org.hibernate.tools.hbm2ddl")) { //$NON-NLS-1$
Hbm2DDLExporter ddlExporter = (Hbm2DDLExporter) exporter;
//avoid users to delete their databases with a single click
ddlExporter.setExport(Boolean.getBoolean(extract.getProperty(ExporterFactoryStrings.EXPORTTODATABASE)));
}
// special handling for QueryExporter
- if (exporterId.equals("org.hibernate.tools.query")) { //$NON-NLS-1$
+ if (getExporterDefinitionId().equals("org.hibernate.tools.query")) { //$NON-NLS-1$
QueryExporter queryExporter = (QueryExporter) exporter;
List<String> queryStrings = new ArrayList<String>();
queryStrings.add(extract.getProperty(ExporterFactoryStrings.QUERY_STRING));
13 years, 9 months
JBoss Tools SVN: r25572 - trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-10-07 13:09:32 -0400 (Thu, 07 Oct 2010)
New Revision: 25572
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java
Log:
https://jira.jboss.org/browse/JBIDE-7060 , SWTBot test was updated.
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2010-10-07 16:45:06 UTC (rev 25571)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2010-10-07 17:09:32 UTC (rev 25572)
@@ -27,6 +27,7 @@
public class ExternalizeStringsDialogTest extends VPEAutoTestCase {
+ private final String TOOL_TIP = "Externalize Strings... (Ctrl+7)"; //$NON-NLS-1$
private final String FOLDER_TEXT_LABEL = "Enter or select the parent folder:"; //$NON-NLS-1$
private final String INCORRECT_TABLE_VALUE = "Table value is incorrect"; //$NON-NLS-1$
private final String TOOLBAR_ICON_ENABLED = "Toolbar buttion should be enabled"; //$NON-NLS-1$
@@ -81,9 +82,9 @@
* Get toolbar button
*/
assertTrue(TOOLBAR_ICON_ENABLED, bot
- .toolbarButtonWithTooltip(JstUIMessages.EXTERNALIZE_STRINGS)
+ .toolbarButtonWithTooltip(TOOL_TIP)
.isEnabled());
- bot.toolbarButtonWithTooltip(JstUIMessages.EXTERNALIZE_STRINGS).click();
+ bot.toolbarButtonWithTooltip(TOOL_TIP).click();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
isUnusedDialogOpened = true;
@@ -172,9 +173,9 @@
* Get toolbar button
*/
assertTrue(TOOLBAR_ICON_ENABLED, bot
- .toolbarButtonWithTooltip(JstUIMessages.EXTERNALIZE_STRINGS)
+ .toolbarButtonWithTooltip(TOOL_TIP)
.isEnabled());
- bot.toolbarButtonWithTooltip(JstUIMessages.EXTERNALIZE_STRINGS).click();
+ bot.toolbarButtonWithTooltip(TOOL_TIP).click();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
isUnusedDialogOpened = true;
@@ -209,9 +210,9 @@
* Get toolbar button
*/
assertTrue(TOOLBAR_ICON_ENABLED, bot
- .toolbarButtonWithTooltip(JstUIMessages.EXTERNALIZE_STRINGS)
+ .toolbarButtonWithTooltip(TOOL_TIP)
.isEnabled());
- bot.toolbarButtonWithTooltip(JstUIMessages.EXTERNALIZE_STRINGS).click();
+ bot.toolbarButtonWithTooltip(TOOL_TIP).click();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
isUnusedDialogOpened = true;
@@ -297,9 +298,9 @@
* Get toolbar button
*/
assertTrue(TOOLBAR_ICON_ENABLED, bot
- .toolbarButtonWithTooltip(JstUIMessages.EXTERNALIZE_STRINGS)
+ .toolbarButtonWithTooltip(TOOL_TIP)
.isEnabled());
- bot.toolbarButtonWithTooltip(JstUIMessages.EXTERNALIZE_STRINGS).click();
+ bot.toolbarButtonWithTooltip(TOOL_TIP).click();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
isUnusedDialogOpened = true;
@@ -367,7 +368,7 @@
* Check that the toolbar buttion is disabled
*/
assertFalse("Toolbar buttion should be disabled", bot //$NON-NLS-1$
- .toolbarButtonWithTooltip(JstUIMessages.EXTERNALIZE_STRINGS)
+ .toolbarButtonWithTooltip(TOOL_TIP)
.isEnabled());
/*
* Select some text
@@ -381,9 +382,9 @@
* Activate the dialog
*/
assertTrue(TOOLBAR_ICON_ENABLED, bot
- .toolbarButtonWithTooltip(JstUIMessages.EXTERNALIZE_STRINGS)
+ .toolbarButtonWithTooltip(TOOL_TIP)
.isEnabled());
- bot.toolbarButtonWithTooltip(JstUIMessages.EXTERNALIZE_STRINGS).click();
+ bot.toolbarButtonWithTooltip(TOOL_TIP).click();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
isUnusedDialogOpened = true;
@@ -412,7 +413,7 @@
/*
* Activate the dialog
*/
- bot.toolbarButtonWithTooltip(JstUIMessages.EXTERNALIZE_STRINGS).click();
+ bot.toolbarButtonWithTooltip(TOOL_TIP).click();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
isUnusedDialogOpened = true;
@@ -441,7 +442,7 @@
/*
* Activate the dialog
*/
- bot.toolbarButtonWithTooltip(JstUIMessages.EXTERNALIZE_STRINGS).click();
+ bot.toolbarButtonWithTooltip(TOOL_TIP).click();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
isUnusedDialogOpened = true;
13 years, 9 months