Author: rob.stryker(a)jboss.com
Date: 2008-12-17 16:23:13 -0500 (Wed, 17 Dec 2008)
New Revision: 12662
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreMessages.properties
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/EventManager.java
Log:
freetesting with max - builder failed when registration wasn't done yet
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreMessages.properties
===================================================================
---
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreMessages.properties 2008-12-17
20:53:59 UTC (rev 12661)
+++
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreMessages.properties 2008-12-17
21:23:13 UTC (rev 12662)
@@ -13,7 +13,7 @@
ProjectCannotBeBuilt=Project {0} does not exist or has no .packages file. Skipping.
ErrorBuilding=An error occurred while building project archives
-ErrorLocatingRootNode=An error occurred locating the root node for {0}
+ErrorLocatingRootNode=An error occurred locating the descriptor for {0}
BuildingProject=Building project {0}
BuildingArchive=Building archive {0}
CreatingFolders=Creating folders
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:53:59 UTC (rev 12661)
+++
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2008-12-17
21:23:13 UTC (rev 12662)
@@ -60,6 +60,7 @@
*/
public class ArchiveBuildDelegate {
+ public static int CANNOT_REGISTER_CODE = 31415;
public ArchiveBuildDelegate() {
}
@@ -74,11 +75,17 @@
IArchiveModelRootNode root = ArchivesModel.instance().getRoot(project);
if( root == null ) {
- IStatus s = new Status(IStatus.ERROR, ArchivesCore.PLUGIN_ID,
+ // Adding a code here. If the project isn't registered yet,
+ // the eclipse code can launch a registration job
+ if(ArchivesModel.instance().canReregister(project)) {
+ ArchivesModel.instance().registerProject(project, monitor);
+ return Status.OK_STATUS;
+ }
+ IStatus s = new Status(IStatus.ERROR, ArchivesCore.PLUGIN_ID, CANNOT_REGISTER_CODE,
ArchivesCore.bind(ArchivesCoreMessages.ErrorLocatingRootNode, project.toOSString()),
null);
EventManager.error(null, new IStatus[]{s});
monitor.done();
- return s;
+ return Status.OK_STATUS;
} else {
IArchiveNode[] nodes = root.getChildren(IArchiveNode.TYPE_ARCHIVE);
ArrayList<IStatus> errors = new ArrayList<IStatus>();
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/EventManager.java
===================================================================
---
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/EventManager.java 2008-12-17
20:53:59 UTC (rev 12661)
+++
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/EventManager.java 2008-12-17
21:23:13 UTC (rev 12662)
@@ -184,7 +184,8 @@
for( int i = 0; i < listeners.length; i++ ) {
try {
listeners[i].modelChanged(delta);
- } catch(Exception e ) {logError(e);} }
+ } catch(Exception e ) {logError(e);}
+ }
}
Show replies by date