JBoss Tools SVN: r12660 - in branches/jbosstools-3.0.0.CR1/archives/plugins: org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-12-17 15:53:32 -0500 (Wed, 17 Dec 2008)
New Revision: 12660
Modified:
branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreMessages.properties
branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java
branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIBuildListener.java
Log:
freetesting with max
Modified: branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreMessages.properties
===================================================================
--- branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreMessages.properties 2008-12-17 20:15:41 UTC (rev 12659)
+++ branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreMessages.properties 2008-12-17 20:53:32 UTC (rev 12660)
@@ -25,7 +25,7 @@
ErrorUpdatingModel=Error updating model changes
ErrorUnmarshallingFile=Error unmarshalling packages file {0}
ArchivesListenerError=Archives listener error
-CouldNotCreateScanner=Could not create directory scanner
+CouldNotCreateScanner=Could not create directory scanner: {0}
ErrorAddChildNode=Error adding child node {0}
RemovingFileset=Removing fileset: {0}
@@ -48,4 +48,4 @@
RegisterProject=Register Project
SaveArchivesJob=Save archives job
ErrorPreSave=Problem executing pre-save runnable
-CreatingDefaultJarConfig=Creating default JAR configuration for java project "{0}"
\ No newline at end of file
+CreatingDefaultJarConfig=Creating default JAR configuration for java project "{0}"
Modified: branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java
===================================================================
--- branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2008-12-17 20:15:41 UTC (rev 12659)
+++ branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2008-12-17 20:53:32 UTC (rev 12660)
@@ -90,6 +90,13 @@
errors.addAll(Arrays.asList(fullArchiveBuild(((IArchive)nodes[i]),
new SubProgressMonitor(monitor, 1000), false)));
}
+// IStatus result;
+// for( int i = 0; i < nodes.length; i++ ) {
+// result = fullArchiveBuild(((IArchive)nodes[i]),
+// new SubProgressMonitor(monitor, 1000), false);
+// if( !result.isOK())
+// errors.addAll(Arrays.asList(result.getChildren()));
+// }
EventManager.finishedBuild(project);
EventManager.error(null, errors.toArray(new IStatus[errors.size()]));
Modified: branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIBuildListener.java
===================================================================
--- branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIBuildListener.java 2008-12-17 20:15:41 UTC (rev 12659)
+++ branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIBuildListener.java 2008-12-17 20:53:32 UTC (rev 12660)
@@ -46,6 +46,9 @@
for( int i = 0; i < multi.length; i++ ) {
ms.add(multi[i]);
}
+ if( ms.getSeverity() == IStatus.OK)
+ return;
+
if( PrefsInitializer.getBoolean(PrefsInitializer.PREF_SHOW_BUILD_ERROR_DIALOG)) {
Display.getDefault().asyncExec(new Runnable() {
public void run() {
17 years
JBoss Tools SVN: r12659 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-12-17 15:15:41 -0500 (Wed, 17 Dec 2008)
New Revision: 12659
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java
Log:
free-test bugs - error message a la max
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 2008-12-17 20:15:25 UTC (rev 12658)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2008-12-17 20:15:41 UTC (rev 12659)
@@ -203,10 +203,13 @@
IStatus[] errors2 = errors.toArray(new IStatus[errors.size()]);
if( log )
EventManager.error(pkg, errors2 );
- MultiStatus ms = new MultiStatus(ArchivesCore.PLUGIN_ID, 0, ArchivesCoreMessages.ErrorBuilding, null);
+ monitor.done();
+ if( errors2.length == 0)
+ return Status.OK_STATUS;
+
+ MultiStatus ms = new MultiStatus(ArchivesCore.PLUGIN_ID, IStatus.ERROR, ArchivesCoreMessages.ErrorBuilding, null);
for( int i = 0; i < errors.size(); i++ )
ms.add(errors.get(i));
- monitor.done();
return ms;
}
17 years
JBoss Tools SVN: r12658 - branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-12-17 15:15:25 -0500 (Wed, 17 Dec 2008)
New Revision: 12658
Modified:
branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java
Log:
free test, max said message that should be ok returning an error
Modified: branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java
===================================================================
--- branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2008-12-17 20:06:43 UTC (rev 12657)
+++ branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2008-12-17 20:15:25 UTC (rev 12658)
@@ -203,10 +203,13 @@
IStatus[] errors2 = errors.toArray(new IStatus[errors.size()]);
if( log )
EventManager.error(pkg, errors2 );
- MultiStatus ms = new MultiStatus(ArchivesCore.PLUGIN_ID, 0, ArchivesCoreMessages.ErrorBuilding, null);
+ monitor.done();
+ if( errors2.length == 0)
+ return Status.OK_STATUS;
+
+ MultiStatus ms = new MultiStatus(ArchivesCore.PLUGIN_ID, IStatus.ERROR, ArchivesCoreMessages.ErrorBuilding, null);
for( int i = 0; i < errors.size(); i++ )
ms.add(errors.get(i));
- monitor.done();
return ms;
}
17 years
JBoss Tools SVN: r12657 - trunk/jst/plugins/org.jboss.tools.jst.firstrun.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2008-12-17 15:06:43 -0500 (Wed, 17 Dec 2008)
New Revision: 12657
Removed:
trunk/jst/plugins/org.jboss.tools.jst.firstrun/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-483 enabling runtime initialization feature in devstudio-nightly build
Deleted: trunk/jst/plugins/org.jboss.tools.jst.firstrun/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.firstrun/plugin.xml 2008-12-17 19:39:19 UTC (rev 12656)
+++ trunk/jst/plugins/org.jboss.tools.jst.firstrun/plugin.xml 2008-12-17 20:06:43 UTC (rev 12657)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension
- point="org.eclipse.ui.startup">
- <startup
- class="org.jboss.tools.jst.firstrun.JBossASAdapterInitializer">
- </startup>
- </extension>
-
-</plugin>
17 years
JBoss Tools SVN: r12656 - branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-12-17 14:39:19 -0500 (Wed, 17 Dec 2008)
New Revision: 12656
Modified:
branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java
Log:
free test, max said message that should be ok returning an error
Modified: branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java
===================================================================
--- branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2008-12-17 19:32:22 UTC (rev 12655)
+++ branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2008-12-17 19:39:19 UTC (rev 12656)
@@ -93,10 +93,13 @@
EventManager.finishedBuild(project);
EventManager.error(null, errors.toArray(new IStatus[errors.size()]));
- MultiStatus ms = new MultiStatus(ArchivesCore.PLUGIN_ID, 0, ArchivesCoreMessages.ErrorBuilding, null);
+ monitor.done();
+ if( errors.size() == 0 )
+ return Status.OK_STATUS;
+
+ MultiStatus ms = new MultiStatus(ArchivesCore.PLUGIN_ID, IStatus.ERROR, ArchivesCoreMessages.ErrorBuilding, null);
for( int i = 0; i < errors.size(); i++ )
ms.add(errors.get(i));
- monitor.done();
return ms;
}
}
17 years
JBoss Tools SVN: r12655 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-12-17 14:32:22 -0500 (Wed, 17 Dec 2008)
New Revision: 12655
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java
Log:
free-test bugs
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 2008-12-17 19:22:28 UTC (rev 12654)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2008-12-17 19:32:22 UTC (rev 12655)
@@ -93,10 +93,13 @@
EventManager.finishedBuild(project);
EventManager.error(null, errors.toArray(new IStatus[errors.size()]));
- MultiStatus ms = new MultiStatus(ArchivesCore.PLUGIN_ID, 0, ArchivesCoreMessages.ErrorBuilding, null);
+ monitor.done();
+ if( errors.size() == 0 )
+ return Status.OK_STATUS;
+
+ MultiStatus ms = new MultiStatus(ArchivesCore.PLUGIN_ID, IStatus.ERROR, ArchivesCoreMessages.ErrorBuilding, null);
for( int i = 0; i < errors.size(); i++ )
ms.add(errors.get(i));
- monitor.done();
return ms;
}
}
17 years
JBoss Tools SVN: r12654 - branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-12-17 14:22:28 -0500 (Wed, 17 Dec 2008)
New Revision: 12654
Modified:
branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java
Log:
JBIDE-3417 showstopper NPE / error message
Modified: branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java
===================================================================
--- branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2008-12-17 19:08:34 UTC (rev 12653)
+++ branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2008-12-17 19:22:28 UTC (rev 12654)
@@ -27,6 +27,7 @@
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.osgi.util.NLS;
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.ArchivesCoreMessages;
import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory;
17 years
JBoss Tools SVN: r12652 - branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-12-17 14:03:53 -0500 (Wed, 17 Dec 2008)
New Revision: 12652
Modified:
branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java
Log:
JBIDE-3417 showstopper NPE / error message
Modified: branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java
===================================================================
--- branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2008-12-17 18:52:08 UTC (rev 12651)
+++ branches/jbosstools-3.0.0.CR1/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2008-12-17 19:03:53 UTC (rev 12652)
@@ -146,7 +146,8 @@
matchingMap = scanner.getMatchedMap();
}
} catch( IllegalStateException ise ) {
- ArchivesCore.getInstance().getLogger().log(IStatus.WARNING, ArchivesCoreMessages.CouldNotCreateScanner, ise);
+ ArchivesCore.getInstance().getLogger().log(IStatus.WARNING,
+ NLS.bind(ArchivesCoreMessages.CouldNotCreateScanner, ise.getMessage()), ise);
matchingPaths = new FileWrapper[0];
matchingMap = new HashMap<String, ArrayList<FileWrapper>>();
}
17 years
JBoss Tools SVN: r12651 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-12-17 13:52:08 -0500 (Wed, 17 Dec 2008)
New Revision: 12651
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java
Log:
JBIDE-3417 NPE / error message changed
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2008-12-17 18:50:07 UTC (rev 12650)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2008-12-17 18:52:08 UTC (rev 12651)
@@ -27,6 +27,7 @@
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.osgi.util.NLS;
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.ArchivesCoreMessages;
import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory;
@@ -146,7 +147,8 @@
matchingMap = scanner.getMatchedMap();
}
} catch( IllegalStateException ise ) {
- ArchivesCore.getInstance().getLogger().log(IStatus.WARNING, ArchivesCoreMessages.CouldNotCreateScanner, ise);
+ ArchivesCore.getInstance().getLogger().log(IStatus.WARNING,
+ NLS.bind(ArchivesCoreMessages.CouldNotCreateScanner, ise.getMessage()), ise);
matchingPaths = new FileWrapper[0];
matchingMap = new HashMap<String, ArrayList<FileWrapper>>();
}
17 years