9:02 p.m.
Author: rob.stryker(a)jboss.com
Date: 2009-10-29 22:02:39 -0400 (Thu, 29 Oct 2009)
New Revision: 18364
Added:
trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/ErrorRoot.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java
Log:
various cleanup
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java 2009-10-30
01:03:07 UTC (rev 18363)
+++
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java 2009-10-30
02:02:39 UTC (rev 18364)
@@ -147,46 +147,6 @@
}
}
- protected int countChanges(IModuleResourceDelta[] deltas) {
- IModuleResource res;
- int count = 0;
- if( deltas == null ) return 0;
- for( int i = 0; i < deltas.length; i++ ) {
- res = deltas[i].getModuleResource();
- if( res != null && res instanceof IModuleFile)
- count++;
- count += countChanges(deltas[i].getAffectedChildren());
- }
- return count;
- }
-
- protected int countConcreteFiles(IModule module) {
- PackagedModuleDelegate delegate =
(PackagedModuleDelegate)module.loadAdapter(PackagedModuleDelegate.class, new
NullProgressMonitor());
- try {
- ArrayList<IPath> list = new ArrayList<IPath>();
- countConcreteFiles(delegate.members()[0], list);
- return list.size();
- } catch( CoreException ce ) {
-
- }
- return -1;
- }
- protected void countConcreteFiles(IModuleResource mr, ArrayList<IPath> list) {
- if( mr instanceof IExtendedModuleResource) {
- IExtendedModuleResource emr = ((IExtendedModuleResource)mr);
- if( mr instanceof IModuleFile ) {
- IPath p = emr.getConcreteDestFile();
- if( !list.contains(p))
- list.add(p);
- }
- if( mr instanceof IModuleFolder) {
- IModuleResource[] children = ((IModuleFolder)mr).members();
- for( int i = 0; i < children.length; i++ )
- countConcreteFiles(children[i], list);
- }
- }
- }
-
protected void publishFromDeltaHandle(IModuleResourceDelta delta, IPath destRoot,
IPath sourcePrefix, ArrayList<IPath> changedFiles) {
switch( delta.getKind()) {
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java 2009-10-30
01:03:07 UTC (rev 18363)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java 2009-10-30
02:02:39 UTC (rev 18364)
@@ -28,6 +28,7 @@
import org.jboss.tools.jmx.core.IConnectionWrapper;
import org.jboss.tools.jmx.core.IJMXRunnable;
import org.jboss.tools.jmx.core.JMXException;
+import org.jboss.tools.jmx.core.tree.ErrorRoot;
import org.jboss.tools.jmx.core.tree.NodeUtils;
import org.jboss.tools.jmx.core.tree.Root;
@@ -74,6 +75,7 @@
} catch( CoreException ce ) {
IStatus status = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
ce.getMessage(), ce);
JBossServerCorePlugin.getDefault().getLog().log(status);
+ root = new ErrorRoot();
} finally {
JMXClassLoaderRepository.getDefault().removeConcerned(server, this);
isLoading = false;
Added:
trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/ErrorRoot.java
===================================================================
---
trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/ErrorRoot.java
(rev 0)
+++
trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/ErrorRoot.java 2009-10-30
02:02:39 UTC (rev 18364)
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jmx.core.tree;
+
+/**
+ * This class is used to signify the true root could
+ * not be loaded.
+ *
+ * @author rob
+ */
+public class ErrorRoot extends Root {
+ public ErrorRoot() {
+ super(null);
+ }
+}