JBoss Tools SVN: r16501 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/properties.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2009-07-08 06:58:42 -0400 (Wed, 08 Jul 2009)
New Revision: 16501
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/properties/QueryPagePropertySource.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4579 - fix for exception
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/properties/QueryPagePropertySource.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/properties/QueryPagePropertySource.java 2009-07-08 09:57:23 UTC (rev 16500)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/properties/QueryPagePropertySource.java 2009-07-08 10:58:42 UTC (rev 16501)
@@ -100,7 +100,7 @@
}
if(QUERY_SIZE.equals(id) ) {
int resultSize = page.getResultSize();
- return resultSize==-1?HibernateConsoleMessages.QueryPagePropertySource_unknown:resultSize;
+ return resultSize==-1?HibernateConsoleMessages.QueryPagePropertySource_unknown:String.valueOf(resultSize);
}
if(QUERY_TIME.equals(id) ) {
long resultTime = page.getQueryTime();
16 years, 9 months
JBoss Tools SVN: r16500 - trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-07-08 05:57:23 -0400 (Wed, 08 Jul 2009)
New Revision: 16500
Added:
trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/FilesetMatchesPathTest.java
Log:
JBIDE-4249 - vaguely-referenced dependency jars will now rebuild those that depend on them in the builder
Added: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/FilesetMatchesPathTest.java
===================================================================
--- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/FilesetMatchesPathTest.java (rev 0)
+++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/FilesetMatchesPathTest.java 2009-07-08 09:57:23 UTC (rev 16500)
@@ -0,0 +1,62 @@
+package org.jboss.ide.eclipse.archives.test.model;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.jboss.ide.eclipse.archives.core.model.ArchivesModel;
+import org.jboss.ide.eclipse.archives.core.model.IArchive;
+import org.jboss.ide.eclipse.archives.core.model.IArchiveModel;
+import org.jboss.ide.eclipse.archives.core.model.IArchiveStandardFileSet;
+import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory.DirectoryScannerExtension.FileWrapper;
+import org.jboss.ide.eclipse.archives.core.model.internal.ArchiveModelNode;
+import org.jboss.ide.eclipse.archives.core.model.internal.xb.XbPackages;
+import org.jboss.ide.eclipse.archives.core.util.ModelUtil;
+import org.jboss.tools.test.util.ResourcesUtils;
+
+
+public class FilesetMatchesPathTest extends ModelTest {
+ public void testAddFilesetToArchive() throws Exception {
+ IProject proj = null;
+ try {
+ proj = ResourcesUtils.importProject("org.jboss.ide.eclipse.archives.test", "/inputs/projects/basicwebproject");
+ proj.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ XbPackages packs = new XbPackages();
+ IArchiveModel model = new ArchivesModel();
+ ArchiveModelNode node = new ArchiveModelNode(proj.getLocation(), packs, model);
+ ModelUtil.fillArchiveModel(packs, node);
+
+ IArchive archive = createArchive("someName.war", "test");
+ IArchiveStandardFileSet fs = getFactory().createFileset();
+ fs.setIncludesPattern("**");
+ fs.setRawSourcePath("basicwebproject/WebContent");
+ fs.setInWorkspace(true);
+ archive.addChild(fs);
+ node.addChild(archive);
+
+ FileWrapper[] wrappers = fs.findMatchingPaths();
+ assertNotNull(wrappers);
+ assertTrue(wrappers.length == 2);
+ IFile file = (IFile)proj.findMember("WebContent/WEB-INF/web.xml");
+ assertNotNull(file);
+ IPath path = file.getFullPath();
+ IPath loc = file.getLocation();
+ boolean matchesPath = fs.matchesPath(path, true);
+ boolean matchesLoc = fs.matchesPath(loc, false);
+ boolean matchesFSGarbage = fs.matchesPath(new Path("/home/rob/some.file.txt"), false);
+ boolean matchesWSGarbage = fs.matchesPath(new Path("nonmatchingProject/file.txt"), true);
+ assertTrue(matchesPath);
+ assertTrue(matchesLoc);
+ assertFalse(matchesFSGarbage);
+ assertFalse(matchesWSGarbage);
+ } finally {
+ try {
+ if( proj != null )
+ proj.delete(true, true, null);
+ } catch( CoreException ce ) {fail();}
+ }
+ }
+}
16 years, 9 months
JBoss Tools SVN: r16499 - in trunk/archives: plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-07-08 05:56:51 -0400 (Wed, 08 Jul 2009)
New Revision: 16499
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspaceVFS.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntVFS.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchivesVFS.java
trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java
trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelUtilTest.java
Log:
JBIDE-4249 - vaguely-referenced dependency jars will now rebuild those that depend on them in the builder
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspaceVFS.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspaceVFS.java 2009-07-08 09:40:08 UTC (rev 16498)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspaceVFS.java 2009-07-08 09:56:51 UTC (rev 16499)
@@ -11,6 +11,7 @@
package org.jboss.ide.eclipse.archives.core.model.other.internal;
import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -93,4 +94,13 @@
}
return null;
}
+
+ public IPath[] absolutePathToWorkspacePath(IPath path) {
+ IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(path);
+ IPath[] paths = new IPath[files.length];
+ for( int i = 0; i < files.length; i++ ) {
+ paths[i] = files[i].getFullPath();
+ }
+ return paths;
+ }
}
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntVFS.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntVFS.java 2009-07-08 09:40:08 UTC (rev 16498)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntVFS.java 2009-07-08 09:56:51 UTC (rev 16499)
@@ -83,5 +83,11 @@
}
return null;
}
-
+
+ // TODO unsupported in ant for now as ant does not use this feature
+ // Ant does not make use of incremental builds and that is the only
+ // place this method is called
+ public IPath[] absolutePathToWorkspacePath(IPath path) {
+ return new IPath[]{};
+ }
}
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2009-07-08 09:40:08 UTC (rev 16498)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2009-07-08 09:56:51 UTC (rev 16499)
@@ -12,8 +12,10 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Comparator;
import java.util.Iterator;
import java.util.Set;
+import java.util.TreeSet;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -31,6 +33,7 @@
import org.jboss.ide.eclipse.archives.core.model.IArchiveFolder;
import org.jboss.ide.eclipse.archives.core.model.IArchiveModelRootNode;
import org.jboss.ide.eclipse.archives.core.model.IArchiveNode;
+import org.jboss.ide.eclipse.archives.core.model.IArchiveNodeVisitor;
import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory.DirectoryScannerExtension.FileWrapper;
import org.jboss.ide.eclipse.archives.core.util.ModelUtil;
import org.jboss.ide.eclipse.archives.core.util.PathUtils;
@@ -81,7 +84,7 @@
monitor.beginTask( ArchivesCore.bind(ArchivesCoreMessages.BuildingProject,
ArchivesCore.getInstance().getVFS().getProjectName(project)), nodes.length * 1000);
-
+
for( int i = 0; i < nodes.length; i++ ) {
errors.addAll(Arrays.asList(
fullArchiveBuild(
@@ -103,6 +106,23 @@
}
}
+ protected IArchive[] findReferences(IArchive node2) {
+ final Set<IArchive> s = new TreeSet<IArchive>();
+ final IPath dest = node2.getArchiveFilePath();
+ ArchivesModel.instance().accept(new IArchiveNodeVisitor(){
+ public boolean visit(IArchiveNode node) {
+ if( node.getNodeType() == IArchiveNode.TYPE_ARCHIVE_FILESET) {
+ IArchiveFileSet fs = (IArchiveFileSet)node;
+ FileWrapper[] wrapper = fs.getMatches(dest);
+ if( wrapper != null && wrapper.length > 0 )
+ s.add(fs.getRootArchive());
+ }
+ return true;
+ }
+ });
+ return (IArchive[]) s.toArray(new IArchive[s.size()]);
+ }
+
/**
* Builds an archive entirely, overwriting whatever was in the output destination.
* @param pkg The archive to build
@@ -183,7 +203,7 @@
// build the filesets
IArchiveFileSet[] filesets = ModelUtil.findAllDescendentFilesets(pkg);
- IProgressMonitor filesetMonitor = new SubProgressMonitor(monitor, 7000);
+ IProgressMonitor filesetMonitor = new SubProgressMonitor(monitor, 6000);
filesetMonitor.beginTask(ArchivesCoreMessages.BuildingFilesets, filesets.length * 1000);
for( int i = 0; i < filesets.length; i++ ) {
IStatus[] errors2 = fullFilesetBuild(filesets[i], new SubProgressMonitor(filesetMonitor, 1000), pkg);
@@ -197,7 +217,21 @@
// actions[i].execute();
// }
// }
+
+
+ ArrayList<IArchive> referencingArchives = new ArrayList<IArchive>();
+ referencingArchives.addAll(Arrays.asList(findReferences(pkg)));
+ IProgressMonitor referenceMon = new SubProgressMonitor(monitor, 1000);
+ referenceMon.beginTask(ArchivesCoreMessages.BuildingArchive,
+ referencingArchives.size() * 1000);
+ for( Iterator<IArchive> i = referencingArchives.iterator(); i.hasNext();) {
+ IArchive toBuild = i.next();
+ errors.add(fullArchiveBuild(
+ toBuild, new SubProgressMonitor(referenceMon, 1000), log));
+ }
+
+
EventManager.finishedBuildingArchive(pkg);
IStatus[] errors2 = errors.toArray(new IStatus[errors.size()]);
if( log )
@@ -243,8 +277,11 @@
Set<IPath> removed, boolean workspaceRelative, IProgressMonitor monitor) {
ArrayList<IStatus> errors = new ArrayList<IStatus>();
+ if( addedChanged.size() == 0 && removed.size() == 0 )
+ return;
+
// removed get more work because all filesets are being rescanned before handling the removed
- int totalWork = (addedChanged.size()*100) + (removed.size()*200) + 50;
+ int totalWork = (addedChanged.size()*100) + (removed.size()*200) + 50 + 500;
monitor.beginTask(ArchivesCoreMessages.ProjectArchivesIncrementalBuild, totalWork);
// find any and all filesets that match each file
@@ -305,10 +342,26 @@
TrueZipUtil.sync();
+ Comparator c = new Comparator() {
+ public int compare(Object o1, Object o2) {
+ return 0;
+ }
+ };
+ Set<IPath> changedPaths = new TreeSet<IPath>(c);
Iterator<IArchive> i2 = topPackagesChanged.iterator();
+ SubProgressMonitor consumedMon = new SubProgressMonitor(monitor, 500);
while(i2.hasNext()) {
- EventManager.finishedBuildingArchive(i2.next());
+ try {
+ IArchive changed = i2.next();
+ changedPaths.add(changed.getArchiveFilePath());
+ EventManager.finishedBuildingArchive(changed);
+ } catch( ClassCastException cce ) {
+ cce.printStackTrace();
+ }
}
+ incrementalBuild(null, changedPaths, new TreeSet(), false,
+ new SubProgressMonitor(consumedMon, 500));
+
if( errors.size() > 0 )
EventManager.error(null, errors.toArray(new IStatus[errors.size()]));
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java 2009-07-08 09:40:08 UTC (rev 16498)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java 2009-07-08 09:56:51 UTC (rev 16499)
@@ -236,7 +236,30 @@
}
public boolean couldBeIncluded(String name, boolean inWorkspace) {
- return super.isIncluded(name) && !super.isExcluded(name);
+ IPath targetBase = ((FileWrapper)getBasedir()).getWrapperPath();
+ IPath[] questionFiles = new IPath[] { new Path(name) };
+ if( workspaceRelative && !inWorkspace) {
+ questionFiles = ArchivesCore.getInstance().getVFS().absolutePathToWorkspacePath(questionFiles[0]);
+ } else if( !workspaceRelative && inWorkspace) {
+ questionFiles[0] = ArchivesCore.getInstance().
+ getVFS().workspacePathToAbsolutePath(questionFiles[0]);
+ }
+ ArrayList<IPath> acceptablePaths = new ArrayList<IPath>();
+ for( int i = 0; i < questionFiles.length; i++ ) {
+ if( targetBase.isPrefixOf(questionFiles[i]))
+ acceptablePaths.add(questionFiles[i].removeFirstSegments(targetBase.segmentCount()));
+ }
+
+ if( acceptablePaths.size() == 0 )
+ return false;
+
+ IPath p;
+ for( int i = 0; i < acceptablePaths.size(); i++ ) {
+ p = acceptablePaths.get(i);
+ if( super.isIncluded(p.toString()) && !super.isExcluded(p.toString()))
+ return true;
+ }
+ return false;
}
}
}
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchivesVFS.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchivesVFS.java 2009-07-08 09:40:08 UTC (rev 16498)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchivesVFS.java 2009-07-08 09:56:51 UTC (rev 16499)
@@ -36,6 +36,12 @@
public IPath workspacePathToAbsolutePath(IPath path);
/**
+ * Translates a global path to any and all workspace path
+ * that match it, if it can
+ */
+ public IPath[] absolutePathToWorkspacePath(IPath path);
+
+ /**
* Get the project name that matches this path
* @param absolutePath
* @return
Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java
===================================================================
--- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java 2009-07-08 09:40:08 UTC (rev 16498)
+++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java 2009-07-08 09:56:51 UTC (rev 16499)
@@ -16,6 +16,7 @@
import org.jboss.ide.eclipse.archives.test.core.ArchivesCoreTest;
import org.jboss.ide.eclipse.archives.test.core.ant.SimpleAntTest;
import org.jboss.ide.eclipse.archives.test.model.DirectoryScannerTest;
+import org.jboss.ide.eclipse.archives.test.model.FilesetMatchesPathTest;
import org.jboss.ide.eclipse.archives.test.model.ModelCreationTest;
import org.jboss.ide.eclipse.archives.test.model.ModelTruezipBridgeTest;
import org.jboss.ide.eclipse.archives.test.model.ModelUtilTest;
@@ -42,6 +43,7 @@
suite.addTestSuite(ModelCreationTest.class);
suite.addTestSuite(ModelTruezipBridgeTest.class);
suite.addTestSuite(SimpleAntTest.class);
+ suite.addTestSuite(FilesetMatchesPathTest.class);
// jiras
suite.addTestSuite(JBIDE1406Test.class);
Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelUtilTest.java
===================================================================
--- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelUtilTest.java 2009-07-08 09:40:08 UTC (rev 16498)
+++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelUtilTest.java 2009-07-08 09:56:51 UTC (rev 16499)
@@ -168,7 +168,6 @@
private boolean testMatches(IArchiveFileSet fs, IPath absoluteFile, IArchiveNode node) {
FileWrapper[] wrappers = fs.getMatches(absoluteFile);
return ModelUtil.otherFilesetMatchesPathAndOutputLocation(fs, absoluteFile, wrappers[0].getFilesetRelative(), wrappers[0].getRootArchiveRelative().toString(), node);
-
}
}
16 years, 9 months
JBoss Tools SVN: r16498 - in trunk/smooks/plugins/org.jboss.tools.smooks.runtime: META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2009-07-08 05:40:08 -0400 (Wed, 08 Jul 2009)
New Revision: 16498
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-edisax-parser-1.1.2.jar
trunk/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-edi-1.1.2.jar
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.runtime/.classpath
trunk/smooks/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF
trunk/smooks/plugins/org.jboss.tools.smooks.runtime/build.properties
Log:
JBIDE-4584
Add Smooks EDI required jar
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.runtime/.classpath
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.runtime/.classpath 2009-07-08 07:58:16 UTC (rev 16497)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.runtime/.classpath 2009-07-08 09:40:08 UTC (rev 16498)
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry exported="true" kind="lib" path="libs/opencsv-1.8.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/milyn-edisax-parser-1.1.2.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-edi-1.1.2.jar"/>
<classpathentry exported="true" kind="lib" path="libs/jackson-lgpl-0.9.3.jar"/>
<classpathentry exported="true" kind="lib" path="libs/milyn-smooks-core-1.1.2.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
@@ -8,6 +11,5 @@
<classpathentry exported="true" kind="lib" path="libs/milyn-commons-1.1.2.jar"/>
<classpathentry exported="true" kind="lib" path="libs/milyn-smooks-csv-1.1.2.jar"/>
<classpathentry exported="true" kind="lib" path="libs/milyn-smooks-json-1.1.2.jar"/>
- <classpathentry kind="lib" path="libs/opencsv-1.8.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF 2009-07-08 07:58:16 UTC (rev 16497)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF 2009-07-08 09:40:08 UTC (rev 16498)
@@ -18,13 +18,16 @@
libs/milyn-commons-1.1.2.jar,
libs/milyn-smooks-csv-1.1.2.jar,
libs/milyn-smooks-json-1.1.2.jar,
- libs/opencsv-1.8.jar,
libs/milyn-smooks-core-1.1.2.jar,
- libs/jackson-lgpl-0.9.3.jar
+ libs/jackson-lgpl-0.9.3.jar,
+ libs/milyn-smooks-edi-1.1.2.jar,
+ libs/milyn-edisax-parser-1.1.2.jar,
+ libs/opencsv-1.8.jar
Bundle-Localization: plugin
Bundle-Vendor: %providerName
Export-Package: org.milyn,
org.milyn.cdr,
org.milyn.csv,
org.milyn.json,
+ org.milyn.smooks.edi,
org.milyn.xml
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.runtime/build.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.runtime/build.properties 2009-07-08 07:58:16 UTC (rev 16497)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.runtime/build.properties 2009-07-08 09:40:08 UTC (rev 16498)
@@ -2,7 +2,9 @@
libs/milyn-commons-1.1.2.jar,\
libs/milyn-smooks-csv-1.1.2.jar,\
libs/milyn-smooks-json-1.1.2.jar,\
- libs/opencsv-1.8.jar,\
libs/milyn-smooks-core-1.1.2.jar,\
- libs/jackson-lgpl-0.9.3.jar
+ libs/jackson-lgpl-0.9.3.jar,\
+ libs/milyn-smooks-edi-1.1.2.jar,\
+ libs/milyn-edisax-parser-1.1.2.jar,\
+ libs/opencsv-1.8.jar
jars.compile.order =
Added: trunk/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-edisax-parser-1.1.2.jar
===================================================================
(Binary files differ)
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-edisax-parser-1.1.2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-edi-1.1.2.jar
===================================================================
(Binary files differ)
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-edi-1.1.2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 9 months
JBoss Tools SVN: r16497 - in trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator: factory and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2009-07-08 03:58:16 -0400 (Wed, 08 Jul 2009)
New Revision: 16497
Modified:
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/XSDUtils.java
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/factory/AdapterFactory.java
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IConstants.java
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ReplyValidator.java
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/Query.java
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathValidator.java
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathVisitor.java
Log:
JBIDE-4567:BPEL validator can no recognize locationpath
JBIDE-4568:BPEL validator issues
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/XSDUtils.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/XSDUtils.java 2009-07-08 06:34:04 UTC (rev 16496)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/XSDUtils.java 2009-07-08 07:58:16 UTC (rev 16497)
@@ -224,7 +224,12 @@
*/
public static List<XSDParticleContent> getChildElements (XSDComplexTypeDefinition bo)
{
- return getChildElements( getModelGroup(bo) );
+ List<XSDParticleContent> children = new ArrayList<XSDParticleContent>();
+ children.addAll(getChildElements(getModelGroup(bo)));
+ if(bo.getBaseTypeDefinition() instanceof XSDComplexTypeDefinition){
+ children.addAll(getChildElements(getModelGroup((XSDComplexTypeDefinition)bo.getBaseTypeDefinition())));
+ }
+ return children;//getChildElements( getModelGroup(bo) );
}
/**
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/factory/AdapterFactory.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/factory/AdapterFactory.java 2009-07-08 06:34:04 UTC (rev 16496)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/factory/AdapterFactory.java 2009-07-08 07:58:16 UTC (rev 16497)
@@ -5,6 +5,8 @@
import java.util.Locale;
import java.util.Map;
+import javax.xml.namespace.QName;
+
import org.eclipse.bpel.model.adapters.AdapterRegistry;
import org.eclipse.bpel.validator.Activator;
import org.eclipse.bpel.validator.IBPELMarker;
@@ -220,7 +222,14 @@
// href.context refers to the problem context, expressed
// in the model object space context.
- props.put( "href.context", problem.getAttribute(IProblem.CONTEXT ));
+ Object context = problem.getAttribute(IProblem.CONTEXT );
+ if( context instanceof QName){
+ QName qname = (QName)context;
+ props.put( "href.context", qname.getLocalPart());
+ }
+ else{
+ props.put( "href.context", problem.getAttribute(IProblem.CONTEXT ));
+ }
// do not save this marker
@@ -231,7 +240,7 @@
try {
marker = resource.createMarker( IBPELMarker.ID );
marker.setAttributes( props );
- } catch (CoreException ex) {
+ } catch (Exception ex) {
// can't create marker ... ?
Activator.log(ex);
return null;
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IConstants.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IConstants.java 2009-07-08 06:34:04 UTC (rev 16496)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IConstants.java 2009-07-08 07:58:16 UTC (rev 16497)
@@ -128,6 +128,8 @@
public static final String REQUEST = "request";
public static final String RESPONSE = "response";
public static final String REQUEST_RESPONSE = "request-response";
+ public static final String IN = "in";
+ public static final String OUT = "out";
//
public static final String PARTNER_ROLE = "partnerRole";
@@ -338,7 +340,7 @@
public static final String ENDPOINT_VALUES [] = { MY_ROLE, PARTNER_ROLE };
- public static final String PATTERN_VALUES [] = { REQUEST , RESPONSE, REQUEST_RESPONSE };
+ public static final String PATTERN_VALUES [] = { REQUEST , RESPONSE, REQUEST_RESPONSE, IN, OUT };
public static final QName REPEATABLE_NODES [] = {
ND_WHILE, ND_REPEAT_UNTIL, ND_FOR_EACH, ND_EVENT_HANDLERS, ND_COMPENSATION_HANDLER };
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ReplyValidator.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ReplyValidator.java 2009-07-08 06:34:04 UTC (rev 16496)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ReplyValidator.java 2009-07-08 07:58:16 UTC (rev 16497)
@@ -122,7 +122,7 @@
* 4) operation -> "input" message must be set.
*/
- INode fInputMessage ;
+ INode fOutMessage ;
/**
* Checks the Input Message for the receive. This just makes
@@ -132,8 +132,8 @@
public void rule_CheckOutputMessage_12 () {
- fInputMessage = findMessageType (fPortTypeFromRole,fOperation,WSDL_ND_INPUT, true );
- setValue("input.message.type", fInputMessage);
+ fOutMessage = findMessageType (fPortTypeFromRole,fOperation,WSDL_ND_OUTPUT, true );
+ setValue("input.message.type", fOutMessage);
}
@@ -155,7 +155,7 @@
{
IProblem problem;
- if (isUndefined(fInputMessage) || isUndefined(fVariable )) {
+ if (isUndefined(fOutMessage) || isUndefined(fVariable )) {
return ;
}
@@ -167,14 +167,14 @@
}
// source -> destination
- if (mModelQuery.check( IModelQueryLookups.TEST_COMPATIBLE_PARTNER_ACTIVITY_MESSAGE, varType, fInputMessage ) == false) {
+ if (mModelQuery.check( IModelQueryLookups.TEST_COMPATIBLE_PARTNER_ACTIVITY_MESSAGE, varType, fOutMessage ) == false) {
problem = createError( );
problem.fill( "BPELC_PA__MESSAGE_TYPE_MISMATCH", //$NON-NLS-1$
toString(mNode.nodeName()),
AT_VARIABLE,
fVariable.getAttribute( AT_NAME ),
- fInputMessage,
+ fOutMessage,
varType
);
}
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/Query.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/Query.java 2009-07-08 06:34:04 UTC (rev 16496)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/Query.java 2009-07-08 07:58:16 UTC (rev 16497)
@@ -10,14 +10,19 @@
*******************************************************************************/
package org.eclipse.bpel.validator.xpath;
+import java.util.Iterator;
+import java.util.Map;
+
import org.eclipse.bpel.validator.model.ARule;
import org.eclipse.bpel.validator.model.INode;
import org.eclipse.bpel.validator.model.IProblem;
-
+import org.eclipse.bpel.validator.model.Problem;
import org.eclipse.bpel.xpath10.Expr;
import org.eclipse.bpel.xpath10.FunctionCallExpr;
import org.eclipse.bpel.xpath10.LocationPath;
+import org.eclipse.bpel.xpath10.UnaryExpr;
import org.eclipse.bpel.xpath10.VariableReferenceExpr;
+import org.eclipse.bpel.xpath10.parser.XPath10Parser.unaryExpr_return;
/**
* @author Michal Chmielewski (michal.chmielewski(a)oracle.com)
@@ -60,7 +65,8 @@
IProblem problem;
Expr expr = xpathExpr ;
- if (expr instanceof LocationPath) {
+ if (expr instanceof UnaryExpr && ((UnaryExpr)expr).getExpr() instanceof LocationPath) {
+ expr = ((UnaryExpr)expr).getExpr();
Object obj = mVisitor.contextPeek();
if (obj instanceof INode) {
@@ -78,7 +84,9 @@
exprStringTrimmed,
toString(mNode.nodeName())
);
+
repointOffsets(problem, expr);
+
}
// Don't run anything else.
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathValidator.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathValidator.java 2009-07-08 06:34:04 UTC (rev 16496)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathValidator.java 2009-07-08 07:58:16 UTC (rev 16497)
@@ -916,9 +916,9 @@
if (isEmptyOrWhitespace(prefix)) {
return true;
}
-
+
String nsURI = lookupNamespace(prefix);
-
+
if (isEmpty(nsURI)) {
IProblem problem = createError();
problem.fill("XPATH_UNRESOLVED_NAMESPACE_PREFIX", //$NON-NLS-1$
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathVisitor.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathVisitor.java 2009-07-08 06:34:04 UTC (rev 16496)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathVisitor.java 2009-07-08 07:58:16 UTC (rev 16497)
@@ -394,7 +394,7 @@
*/
public void visit ( Object obj ) {
- if (obj instanceof PathExpr) {
+ if (obj instanceof PathExpr) {;
visit((PathExpr) obj);
} else if (obj instanceof LocationPath) {
visit((LocationPath) obj);
16 years, 9 months
JBoss Tools SVN: r16496 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2009-07-08 02:34:04 -0400 (Wed, 08 Jul 2009)
New Revision: 16496
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java
Log:
JBIDE-4578
synchronize the modified codes to trunk.
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java 2009-07-08 06:04:40 UTC (rev 16495)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java 2009-07-08 06:34:04 UTC (rev 16496)
@@ -141,7 +141,7 @@
gd.horizontalSpan = 2;
separator.setLayoutData(gd);
- Hyperlink link = toolkit.createHyperlink(parent, "Add Value binding and Bean binding automatically", SWT.NONE);
+ Hyperlink link = toolkit.createHyperlink(parent, "Add Binding", SWT.NONE);
final Composite fp = parent;
final BindingsType fb = (BindingsType)model;
final SmooksMultiFormEditor ff = formEditor;
@@ -217,8 +217,8 @@
private void generateValueWiringModel(Object[] models,SmooksMultiFormEditor editor , BindingsType owner){
EditingDomain domain = editor.getEditingDomain();
CompoundCommand command = new CompoundCommand();
- command.setDescription("Add Value binding and Bean binding");
- command.setLabel("Auto add Value/Bean binding");
+ command.setDescription("Add Binding");
+ command.setLabel("Auto add binding");
for (int i = 0; i < models.length; i++) {
Object model = models[i];
if(model instanceof JavaBeanModel){
16 years, 9 months
JBoss Tools SVN: r16495 - trunk/tests/features/org.jboss.tools.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-07-08 02:04:40 -0400 (Wed, 08 Jul 2009)
New Revision: 16495
Modified:
trunk/tests/features/org.jboss.tools.test.feature/feature.xml
Log:
fix test features
Modified: trunk/tests/features/org.jboss.tools.test.feature/feature.xml
===================================================================
--- trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2009-07-08 06:00:48 UTC (rev 16494)
+++ trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2009-07-08 06:04:40 UTC (rev 16495)
@@ -218,229 +218,9 @@
</license>
<plugin
- id="org.jboss.tools.common.kb.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.common.model.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.common.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.common.verification.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf.text.ext.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf.verification.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jst.web.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
id="org.jboss.tools.tests"
download-size="0"
install-size="0"
version="0.0.0"/>
- <plugin
- id="org.jboss.tools.vpe.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jst.web.ui.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.seam.core.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.seam.ui.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.vpe.xulrunner.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf.vpe.richfaces.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf.vpe.facelets.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf.vpe.jsf.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf.vpe.seam.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.struts.vpe.struts.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.common.model.ui.test"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.jboss.tools.jst.jsp.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.vpe.ui.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.vpe.html.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.vpe.jsp.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf.vpe.myfaces.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.ide.eclipse.archives.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.common.el.core.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.ws.core.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.ws.ui.test"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.jboss.tools.common.text.ext.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jmx.core.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jmx.ui.test"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.jboss.tools.jbpm.convert.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf.ui.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.seam.pages.xml.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.common.verification.ui.test"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.jboss.tools.jsf.vpe.jstl.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
</feature>
16 years, 9 months
JBoss Tools SVN: r16494 - branches/jbosstools-3.1.0.M2/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2009-07-08 02:00:48 -0400 (Wed, 08 Jul 2009)
New Revision: 16494
Modified:
branches/jbosstools-3.1.0.M2/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java
Log:
JBIDE-4578
Change the label to be "Add Binding"
Modified: branches/jbosstools-3.1.0.M2/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java
===================================================================
--- branches/jbosstools-3.1.0.M2/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java 2009-07-08 05:54:49 UTC (rev 16493)
+++ branches/jbosstools-3.1.0.M2/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java 2009-07-08 06:00:48 UTC (rev 16494)
@@ -141,7 +141,7 @@
gd.horizontalSpan = 2;
separator.setLayoutData(gd);
- Hyperlink link = toolkit.createHyperlink(parent, "Add Value binding and Bean binding automatically", SWT.NONE);
+ Hyperlink link = toolkit.createHyperlink(parent, "Add Binding", SWT.NONE);
final Composite fp = parent;
final BindingsType fb = (BindingsType)model;
final SmooksMultiFormEditor ff = formEditor;
@@ -217,8 +217,8 @@
private void generateValueWiringModel(Object[] models,SmooksMultiFormEditor editor , BindingsType owner){
EditingDomain domain = editor.getEditingDomain();
CompoundCommand command = new CompoundCommand();
- command.setDescription("Add Value binding and Bean binding");
- command.setLabel("Auto add Value/Bean binding");
+ command.setDescription("Auto add bindings");
+ command.setLabel("Auto add binding");
for (int i = 0; i < models.length; i++) {
Object model = models[i];
if(model instanceof JavaBeanModel){
16 years, 9 months
JBoss Tools SVN: r16493 - in trunk: bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: sflanigan
Date: 2009-07-08 01:54:49 -0400 (Wed, 08 Jul 2009)
New Revision: 16493
Modified:
trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELModuleFacetConstants.java
trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizard.java
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/AppFileLocProvider.java
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3557 Externalize English strings (fixed mis-formatted NON-NLS comments)
Modified: trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELModuleFacetConstants.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELModuleFacetConstants.java 2009-07-08 05:49:45 UTC (rev 16492)
+++ trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELModuleFacetConstants.java 2009-07-08 05:54:49 UTC (rev 16493)
@@ -21,8 +21,8 @@
public final static String BPEL20_MODULE_TYPE = "bpel.module"; //$NON-NLS-1$
// module type versions
- public final static String BPEL11_MODULE_VERSION = "1.1"; // $NON-NLS-1$
- public final static String BPEL20_MODULE_VERSION = "2.0"; // $NON-NLS-1$
+ public final static String BPEL11_MODULE_VERSION = "1.1"; //$NON-NLS-1$
+ public final static String BPEL20_MODULE_VERSION = "2.0"; //$NON-NLS-1$
// facet template
public final static String BPEL20_FACET_TEMPLATE = "template.bpel.core"; //$NON-NLS-1$
Modified: trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizard.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizard.java 2009-07-08 05:49:45 UTC (rev 16492)
+++ trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizard.java 2009-07-08 05:54:49 UTC (rev 16493)
@@ -102,7 +102,7 @@
*/
@Override
protected IWizardPage createFirstPage() {
- return new NewBPELProjectWizardPage1(model, "newBPELProject"); // $NON-NLS-1$
+ return new NewBPELProjectWizardPage1(model, "newBPELProject"); //$NON-NLS-1$
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java 2009-07-08 05:49:45 UTC (rev 16492)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java 2009-07-08 05:54:49 UTC (rev 16493)
@@ -12,14 +12,14 @@
public class BrowserPlugin extends BaseUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.tools.vpe.xulrunner"; // $NON-NLS-1$
+ public static final String PLUGIN_ID = "org.jboss.tools.vpe.xulrunner"; //$NON-NLS-1$
public static final boolean DEBUG_BROWSERSTART;
// The shared instance
private static BrowserPlugin plugin;
static {
- DEBUG_BROWSERSTART = "true".equals(Platform.getDebugOption(PLUGIN_ID + "/debug/browser_start")); // $NON-NLS-1$ // $NON-NLS-1$
+ DEBUG_BROWSERSTART = "true".equals(Platform.getDebugOption(PLUGIN_ID + "/debug/browser_start")); //$NON-NLS-1$ //$NON-NLS-2$
}
/**
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/AppFileLocProvider.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/AppFileLocProvider.java 2009-07-08 05:49:45 UTC (rev 16492)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/AppFileLocProvider.java 2009-07-08 05:54:49 UTC (rev 16493)
@@ -10,18 +10,18 @@
private File xulRunnerPath;
private File userDataPath;
- private static final String PLUGINS_DIRECTORY = "plugins"; // $NON-NLS-1$
- private static final String HISTORY_FILE = "history.dat"; // $NON-NLS-1$
- private static final String COMPREG_FILE = "compreg.dat"; // $NON-NLS-1$
- private static final String XPTI_FILE = "xpti.dat"; // $NON-NLS-1$
+ private static final String PLUGINS_DIRECTORY = "plugins"; //$NON-NLS-1$
+ private static final String HISTORY_FILE = "history.dat"; //$NON-NLS-1$
+ private static final String COMPREG_FILE = "compreg.dat"; //$NON-NLS-1$
+ private static final String XPTI_FILE = "xpti.dat"; //$NON-NLS-1$
private static final String COMPONENTS_DIRECTORY = "components"; //$NON-NLS-1$
public AppFileLocProvider(File xulRunnerPath) {
this.xulRunnerPath = xulRunnerPath;
- this.userDataPath = Platform.getLocation().append(".metadata/.plugins") // $NON-NLS-1$
+ this.userDataPath = Platform.getLocation().append(".metadata/.plugins") //$NON-NLS-1$
.append(BrowserPlugin.PLUGIN_ID)
- .append("xulrunner").toFile(); // $NON-NLS-1$
+ .append("xulrunner").toFile(); //$NON-NLS-1$
}
public File getFile(String prop, boolean[] persistent) {
@@ -29,17 +29,17 @@
File resultFile = null;
- if ("ProfD".equals(prop)) { // $NON-NLS-1$
+ if ("ProfD".equals(prop)) { //$NON-NLS-1$
resultFile = userDataPath;
- } else if ("UHist".equals(prop)) { // $NON-NLS-1$
+ } else if ("UHist".equals(prop)) { //$NON-NLS-1$
resultFile = new File(userDataPath, HISTORY_FILE);
- } else if ("ComRegF".equals(prop)) { // $NON-NLS-1$
+ } else if ("ComRegF".equals(prop)) { //$NON-NLS-1$
resultFile = new File(userDataPath, COMPREG_FILE);
- } else if ("XptiRegF".equals(prop)) { // $NON-NLS-1$
+ } else if ("XptiRegF".equals(prop)) { //$NON-NLS-1$
resultFile = new File(userDataPath, XPTI_FILE);
- } else if ("GreD".equals(prop)) { // $NON-NLS-1$
+ } else if ("GreD".equals(prop)) { //$NON-NLS-1$
resultFile = xulRunnerPath;
- } else if ("GreComsD".equals(prop) || "ComsD".equals(prop)) { // $NON-NLS-1$ // $NON-NLS-1$
+ } else if ("GreComsD".equals(prop) || "ComsD".equals(prop)) { //$NON-NLS-1$ //$NON-NLS-2$
resultFile = new File(xulRunnerPath, COMPONENTS_DIRECTORY);
}
@@ -52,7 +52,7 @@
public File[] getFiles(String prop) {
File[] resultFiles = null;
- if("APluginsDL".equals(prop)) { // $NON-NLS-1$
+ if("APluginsDL".equals(prop)) { //$NON-NLS-1$
resultFiles = new File[] {new File(xulRunnerPath, PLUGINS_DIRECTORY)};
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2009-07-08 05:49:45 UTC (rev 16492)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2009-07-08 05:54:49 UTC (rev 16493)
@@ -72,9 +72,9 @@
protected static final long NS_ERROR_FAILURE = 0x80004005L;
static {
- XULRUNNER_BUNDLE = (new StringBuffer("org.mozilla.xulrunner")) // $NON-NLS-1$
- .append(".").append(Platform.getWS()) // $NON-NLS-1$
- .append(".").append(Platform.getOS()) // $NON-NLS-1$
+ XULRUNNER_BUNDLE = (new StringBuffer("org.mozilla.xulrunner")) //$NON-NLS-1$
+ .append(".").append(Platform.getWS()) //$NON-NLS-1$
+ .append(".").append(Platform.getOS()) //$NON-NLS-1$
.append(Platform.OS_MACOSX.equals(Platform.getOS()) ? "" : (new StringBuffer(".")).append(Platform.getOSArch()).toString()) //$NON-NLS-1$ //$NON-NLS-2$
.toString();
@@ -88,7 +88,7 @@
webBrowser = (nsIWebBrowser) browser.getWebBrowser();
if (webBrowser == null) {
- throw new XulRunnerException("nsIWebBrowser is not available"); // $NON-NLS-1$
+ throw new XulRunnerException("nsIWebBrowser is not available"); //$NON-NLS-1$
}
setBoolRootPref(PREFERENCE_DISABLEOPENDURINGLOAD, true);
@@ -117,7 +117,7 @@
File file = new File(xulRunnerPath);
mozilla.initialize(file);
mozilla.initEmbedding(file, file, new AppFileLocProvider(file));
- System.setProperty(XULRUNNER_INITIALIZED, "true"); // $NON-NLS-1$
+ System.setProperty(XULRUNNER_INITIALIZED, "true"); //$NON-NLS-1$
}
}
@@ -234,7 +234,7 @@
URL url1 = FileLocator.resolve(url);
xulRunnerFile = new File(FileLocator.toFileURL(url1).getFile());
} catch (IOException ioe) {
- throw new XulRunnerException("Cannot get path to XULRunner from bundle " + getXulRunnerBundle(), ioe); // $NON-NLS-1$
+ throw new XulRunnerException("Cannot get path to XULRunner from bundle " + getXulRunnerBundle(), ioe); //$NON-NLS-1$
}
xulRunnerPath = xulRunnerFile.getAbsolutePath();
16 years, 9 months