[teiid-commits] teiid SVN: r715 - in trunk: console/src/main/java/com/metamatrix/console/connections and 26 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Sat Apr 4 12:42:31 EDT 2009
Author: shawkins
Date: 2009-04-04 12:42:31 -0400 (Sat, 04 Apr 2009)
New Revision: 715
Added:
trunk/console/src/test/java/com/metamatrix/toolbox/
trunk/console/src/test/java/com/metamatrix/toolbox/ui/
trunk/console/src/test/java/com/metamatrix/toolbox/ui/widget/
trunk/console/src/test/java/com/metamatrix/toolbox/ui/widget/util/
trunk/console/src/test/java/com/metamatrix/toolbox/ui/widget/util/TestStringFilter.java
Removed:
trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/transfer/AbstractDragAndDropController.java
trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/transfer/AbstractTreeNodeDragAndDropController.java
Modified:
trunk/client/src/main/java/com/metamatrix/client/ExceptionUtil.java
trunk/console/src/main/java/com/metamatrix/console/connections/ConnectionInfo.java
trunk/console/src/main/java/com/metamatrix/console/main/AdminConsoleMain.java
trunk/console/src/main/java/com/metamatrix/console/models/ConfigurationManager.java
trunk/console/src/main/java/com/metamatrix/console/models/ConfigurationPropertiedObjectEditor.java
trunk/console/src/main/java/com/metamatrix/console/models/EntitlementManager.java
trunk/console/src/main/java/com/metamatrix/console/models/PropertiesManager.java
trunk/console/src/main/java/com/metamatrix/console/models/ResourcePropertiedObjectEditor.java
trunk/console/src/main/java/com/metamatrix/console/models/RuntimeMgmtManager.java
trunk/console/src/main/java/com/metamatrix/console/ui/dialog/ConsoleLogin.java
trunk/console/src/main/java/com/metamatrix/console/ui/treetable/DynamicTreeTableModel.java
trunk/console/src/main/java/com/metamatrix/console/ui/util/ColumnSortInfo.java
trunk/console/src/main/java/com/metamatrix/console/ui/util/POPWithButtons.java
trunk/console/src/main/java/com/metamatrix/console/ui/util/property/GuiComponentFactory.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/authorization/ProvidersMain.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/connector/ConnectorPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbinding/ConnectorBindingPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/CreatePSCPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/DeployMainPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/PscDefinitionPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/UpdatePSCPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements/DataNodeAuthorizationsControl.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements/DataNodesTreeModel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/queries/QueryPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/queries/QueryRequestPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/syslog/SysLogPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/transactions/TransactionsPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/users/NewGroupsWizardSelectionPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/CreateVDBPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/EntitlementMigrationReportSummaryPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbAssignConnBindPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbConnBindPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbDetailPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbEditConnBindDlg.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbEntitlementsPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbMainPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbModelsPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbRoleOptionsPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbSetStatusDlg.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizardConfirmPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizardEditConnBindPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizardEntitlementsPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizardEntitlementsSelectPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizardIdPanel.java
trunk/console/src/main/java/com/metamatrix/console/util/AutoRefresher.java
trunk/console/src/main/java/com/metamatrix/console/util/DaysHoursMinutesSeconds.java
trunk/console/src/main/java/com/metamatrix/console/util/ExceptionUtility.java
trunk/console/src/main/java/com/metamatrix/console/util/QCDate.java
trunk/console/src/main/java/com/metamatrix/console/util/RuntimeExternalException.java
trunk/console/src/main/java/com/metamatrix/console/util/StaticTreeUtilities.java
trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/ComboButtonWidget.java
trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/SeparatorWidget.java
trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/util/BrowserControl.java
trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/util/PropertyLoader.java
trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/util/StringFilter.java
trunk/console/src/test/java/com/metamatrix/uddi/publish/SaveBusiness.java
Log:
TEIID-462 adding consistency in logging and reporting of exceptions.
Modified: trunk/client/src/main/java/com/metamatrix/client/ExceptionUtil.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/client/ExceptionUtil.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/client/src/main/java/com/metamatrix/client/ExceptionUtil.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -32,6 +32,16 @@
public class ExceptionUtil {
+ public static <T extends Throwable> T getExceptionOfType(Throwable ex, Class<T> cls) {
+ while (ex != null) {
+ if (cls.isAssignableFrom(ex.getClass())) {
+ return (T)ex;
+ }
+ ex = ex.getCause();
+ }
+ return null;
+ }
+
public static Throwable convertException(Method method, Throwable exception) {
boolean canThrowXATransactionException = false;
Class<?>[] exceptionClasses = method.getExceptionTypes();
Modified: trunk/console/src/main/java/com/metamatrix/console/connections/ConnectionInfo.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/connections/ConnectionInfo.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/connections/ConnectionInfo.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -31,8 +31,6 @@
import com.metamatrix.admin.AdminPlugin;
import com.metamatrix.admin.api.exception.AdminException;
import com.metamatrix.admin.api.server.ServerAdmin;
-import com.metamatrix.api.exception.ComponentCommunicationException;
-import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.security.LogonException;
import com.metamatrix.common.api.HostInfo;
import com.metamatrix.common.api.MMURL;
@@ -173,11 +171,8 @@
connection = relogin();
return connection;
- } catch (MetaMatrixComponentException e) {
+ } catch (Exception e) {
throw new MetaMatrixRuntimeException(e);
- } catch(Exception e) {
- e.printStackTrace();
- throw new MetaMatrixRuntimeException(e);
}
}
@@ -265,29 +260,11 @@
return connection;
}
- public ServerConnection relogin() throws MetaMatrixComponentException {
-
+ public ServerConnection relogin() throws Exception {
close();
-
- Exception e = null;
- connection = null;
- try {
- connection = login();
- boolean initSucceeded = ModelManager.init(this);
-
- if (initSucceeded) {
- return connection;
- }
- } catch (Exception ex) {
- e = ex;
- }
- // If we're here we've retried the maximum number of times
- String msg = "Lost communication with Server."; //$NON-NLS-1$
- if (e instanceof LogonException) {
- msg = "Current credentials are no longer valid. This connection should be closed."; //$NON-NLS-1$
- }
- ComponentCommunicationException cce = new ComponentCommunicationException(e, msg);
- throw cce;
+ connection = login();
+ ModelManager.init(this);
+ return connection;
}
@@ -311,7 +288,7 @@
* TODO: cache this? Need to make sure it gets closed when the console exits.
* @throws CommunicationException
*/
- public synchronized ServerAdmin getServerAdmin() throws AdminException, LogonException, CommunicationException {
+ public synchronized ServerAdmin getServerAdmin() throws AdminException, CommunicationException {
if (this.serverAdmin == null) {
this.serverAdmin = ServerAdminFactory.getInstance().createAdmin(user, password, url, applicationName);
}
Modified: trunk/console/src/main/java/com/metamatrix/console/main/AdminConsoleMain.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/main/AdminConsoleMain.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/main/AdminConsoleMain.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -204,18 +204,6 @@
}
private void setUpLogging() {
- String captureSystemOutProp =
- "metamatrix.log.captureSystemOut"; //$NON-NLS-1$
- String captureSystemErrProp =
- "metamatrix.log.captureSystemErr"; //$NON-NLS-1$
- String captureSystemOutVal = System.getProperty(
- captureSystemOutProp, "false");
- boolean captureSystemOut = captureSystemOutVal.equalsIgnoreCase(
- "true"); //$NON-NLS-1$
- String captureSystemErrVal = System.getProperty(
- captureSystemErrProp, "false");
- boolean captureSystemErr = captureSystemErrVal.equalsIgnoreCase(
- "true"); //$NON-NLS-1$
String logFileProp = "metamatrix.log.file"; //$NON-NLS-1$
String logFile = System.getProperty(logFileProp);
File tmpFile = null;
@@ -245,12 +233,8 @@
try {
FileOutputStream fos = new FileOutputStream(tmpFile);
PrintStream log = new PrintStream(fos);
- if (captureSystemOut) {
- System.setOut(log);
- }
- if (captureSystemErr) {
- System.setErr(log);
- }
+ System.setOut(log);
+ System.setErr(log);
FileLogWriter flw = new FileLogWriter(tmpFile);
PlatformLog logger = new PlatformLog();
logger.addListener(flw);
Modified: trunk/console/src/main/java/com/metamatrix/console/models/ConfigurationManager.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/models/ConfigurationManager.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/models/ConfigurationManager.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -263,7 +263,6 @@
importEditor.createConfiguration(nextStartUpId, theImportedObjects);
getAPI().executeTransaction(importEditor.getDestination().getActions());
} catch (Exception theException) {
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("commitImportedObjects", theException), //$NON-NLS-1$
theException);
@@ -309,7 +308,6 @@
if (editor != null) {
editor.getDestination().popActions();
}
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("createHost", "host=" + theHostName, theException), //$NON-NLS-1$ //$NON-NLS-2$
theException);
@@ -399,7 +397,6 @@
if (editor != null) {
editor.getDestination().popActions();
}
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("createProcess", //$NON-NLS-1$
"process=" + theProcessName + //$NON-NLS-1$
@@ -466,7 +463,6 @@
if (editor != null) {
editor.getDestination().popActions();
}
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("createPscDef", //$NON-NLS-1$
"psc name=" + thePscDefName + //$NON-NLS-1$
@@ -530,7 +526,6 @@
if (editor != null) {
editor.getDestination().popActions();
}
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("updatePscDef", //$NON-NLS-1$
"psc name=" + thePscDef.getName() + //$NON-NLS-1$
@@ -606,7 +601,6 @@
if (editor != null) {
editor.getDestination().popActions();
}
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("createPscDef", //$NON-NLS-1$
"psc name=" + thePscDefName + //$NON-NLS-1$
@@ -709,7 +703,6 @@
if (editor != null) {
editor.getDestination().popActions();
}
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("deleteDeployedPsc", //$NON-NLS-1$
"PSC=" + thePsc + ", process=" + theProcess + //$NON-NLS-1$ //$NON-NLS-2$
@@ -741,7 +734,6 @@
"ConfigurationManager.deleteHost:" + theHost); //$NON-NLS-1$
}
catch (Exception theException) {
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("deleteHost", //$NON-NLS-1$
"host=" + theHost +", config=" + theConfigId, //$NON-NLS-1$ //$NON-NLS-2$
@@ -816,7 +808,6 @@
//fireModelChangedEvent(MODEL_CHANGED);
} catch (Exception theException) {
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("deleteProcess", //$NON-NLS-1$
"process=" + theProcess + ", config=" + theConfigId, //$NON-NLS-1$ //$NON-NLS-2$
@@ -850,7 +841,6 @@
new Object[] {theProduct,
getConfig(theConfigId)}));
} catch (Exception theException) {
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("deletePscDefinition", //$NON-NLS-1$
"PSC=" + thePsc + //$NON-NLS-1$
@@ -926,7 +916,6 @@
if (editor != null) {
editor.getDestination().popActions();
}
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("deployPsc", //$NON-NLS-1$
"PSC=" + thePsc + //$NON-NLS-1$
@@ -983,7 +972,6 @@
// return getConfigModel(theConfigId).getAllObjects();
return getAPI().getConfigurationAndDependents(theConfigId);
} catch (Exception theException) {
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("getConfigObjects", //$NON-NLS-1$
"config=" + theConfigId, //$NON-NLS-1$
@@ -992,28 +980,6 @@
}
}
-// public ConflictObjectNode getConflictObjectNode(
-// Collection theImportedObjects)
-// throws ExternalException {
-//
-// try {
-// Collection currentObjs = api.getAllGlobalConfigObjects();
-// ConflictStrategy strategy =
-// new ReplaceConfigurationConflictStrategy();
-// ConflictObjectNode node =
-// ConfigurationObjectsImportHelper.getConflicts(
-// theImportedObjects, currentObjs, strategy);
-//
-// return node;
-// }
-// catch (Exception theException) {
-// theException.printStackTrace();
-// throw new ExternalException(
-// formatErrorMsg("getConflictObjectNode", theException), //$NON-NLS-1$
-// theException);
-// }
-// }
-
public Collection getDeployedPscs(VMComponentDefn theProcess)
throws ExternalException {
@@ -1075,7 +1041,6 @@
}
} catch (Exception theException) {
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("getDeployedPscs", //$NON-NLS-1$
"process=" + theProcess, //$NON-NLS-1$
@@ -1154,7 +1119,6 @@
map.put(theProcess.getID(), ids);
deployedServices.put(pscId, map);
} catch (Exception theException) {
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("getDeployedServices", //$NON-NLS-1$
"PSC=" + thePsc + //$NON-NLS-1$
@@ -1192,7 +1156,6 @@
configEditor.getDestination().clear();
return configEditor;
} catch (Exception theException) {
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("getEditor", theException), //$NON-NLS-1$
theException);
@@ -1313,7 +1276,6 @@
} // end of where config = null
return result;
} catch (Exception theException) {
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("getHostProcesses", //$NON-NLS-1$
"host=" + theHost + ", config=" + theConfigId, //$NON-NLS-1$ //$NON-NLS-2$
@@ -1371,7 +1333,6 @@
ConfigurationPropertiedObjectEditor propEditor = new ConfigurationPropertiedObjectEditor(getConnection(), queue);
return propEditor;
} catch (Exception theException) {
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("getPropertiedObjectEditor", theException), //$NON-NLS-1$
theException);
@@ -1601,7 +1562,6 @@
Configuration.NEXT_STARTUP);
return configObjs;
} catch (Exception theException) {
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("importObjects", //$NON-NLS-1$
"file name=" + theFileName, //$NON-NLS-1$
@@ -1693,7 +1653,6 @@
return host;
} catch (Exception theException) {
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("modifyHost", "host=" + theHost, theException), //$NON-NLS-1$ //$NON-NLS-2$
theException);
@@ -1721,7 +1680,6 @@
new Object[] {host, config}));
return process;
} catch (Exception theException) {
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("modifyProcess", //$NON-NLS-1$
"process=" + theProcess, //$NON-NLS-1$
@@ -1737,7 +1695,6 @@
ModificationActionQueue queue = editor.getQueue();
getAPI().executeTransaction(queue.popActions());
} catch (Exception theException) {
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("modifyPropertiedObject", theException), //$NON-NLS-1$
theException);
@@ -1767,7 +1724,6 @@
new Object[] {product, config}));
return pscDef;
} catch (Exception theException) {
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("modifyPsc", "PSC=" + thePscDef, theException), //$NON-NLS-1$ //$NON-NLS-2$
theException);
@@ -1799,7 +1755,6 @@
}
return service;
} catch (Exception theException) {
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("modifyService", //$NON-NLS-1$
"service=" + theService, //$NON-NLS-1$
@@ -1870,7 +1825,6 @@
refreshNeeded = false;
} catch (Exception theException) {
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("refreshConfigs", theException), //$NON-NLS-1$
theException);
@@ -1920,7 +1874,6 @@
}
}
} catch (Exception theException) {
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("refreshHosts", theException), //$NON-NLS-1$
theException);
@@ -2012,7 +1965,6 @@
if (editor != null) {
editor.getDestination().popActions();
}
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("setEnabled", //$NON-NLS-1$
"service=" + theService + //$NON-NLS-1$
Modified: trunk/console/src/main/java/com/metamatrix/console/models/ConfigurationPropertiedObjectEditor.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/models/ConfigurationPropertiedObjectEditor.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/models/ConfigurationPropertiedObjectEditor.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -350,10 +350,6 @@
Assertion.isNotNull(def,AdminPlugin.Util.getString(AdminMessages.ADMIN_0018, "PropertyDefinition")); //$NON-NLS-1$
}
-//System.out.println("setValue(" + obj + ", " + def + ", " + value + ")");
-//if (value != null) {
-// System.out.println("value obj type = " + value.getClass().getName());
-//}
try{
ComponentTypeDefn typeDefn = getConfigurationManager().getComponentTypeDefn(def, componentObject);
if (!typeDefn.getComponentTypeID().equals(componentObject.getComponentTypeID())){
@@ -412,7 +408,6 @@
} catch (MetaMatrixComponentException e){
throw new MetaMatrixRuntimeException(e, AdminMessages.ADMIN_0028, AdminPlugin.Util.getString(AdminMessages.ADMIN_0028));
} catch (ClassCastException e){
-// e.printStackTrace();
throw new MetaMatrixRuntimeException(e, AdminMessages.ADMIN_0029, AdminPlugin.Util.getString(AdminMessages.ADMIN_0029));
}
}
Modified: trunk/console/src/main/java/com/metamatrix/console/models/EntitlementManager.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/models/EntitlementManager.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/models/EntitlementManager.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -337,9 +337,7 @@
try {
AuthorizationPolicyID policyID = new AuthorizationPolicyID(
entName, vdbName, vdbVersion);
-//System.err.println("in getEntitlementInfo(), policyID is " + policyID);
AuthorizationPolicy policy = this.getPolicy(policyID);
-//System.err.println("description for policy is " + policy.getDescription());
Collection coll = this.getPrincipalsForEntitlement(policyID);
PermissionDataNodeTreeView tv = this.getTreeViewForData(vdbName, vdbVersion, policyID);
EntitlementInfo entInfo = new EntitlementInfo(tv, policyID, policy,
@@ -396,9 +394,6 @@
aoe.modifyPermissions(treeView, policy);
}
ModificationActionQueue maq = aoe.getDestination();
-//System.err.println("Connected to " + getConnection().getURL());
-//System.err.println("ModificationActionQueue for " + policy.getAuthorizationPolicyID().getName() + " is:");
-//System.err.println(maq);
List actions = maq.popActions();
AuthorizationAdminAPI api = ModelManager.getAuthorizationAPI(
getConnection());
@@ -476,7 +471,6 @@
try {
PermissionNode pNode = perms.getCorrespondingNode();
pNode.setActions(actions);
-//System.err.println("setting actions for node " + pNode + " to " + actions);
} catch (com.metamatrix.platform.admin.api.exception.PermissionNodeNotActionableException ex) {
LogManager.logError(LogContexts.ENTITLEMENTS, ex,
"On modifying entitlement recvd " + //$NON-NLS-1$
Modified: trunk/console/src/main/java/com/metamatrix/console/models/PropertiesManager.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/models/PropertiesManager.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/models/PropertiesManager.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -178,7 +178,6 @@
} catch (ComponentNotFoundException e) {
throw(e);
} catch (Exception e) {
- e.printStackTrace();
throw new ExternalException(e);
}
return nextStartUpDefn;
Modified: trunk/console/src/main/java/com/metamatrix/console/models/ResourcePropertiedObjectEditor.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/models/ResourcePropertiedObjectEditor.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/models/ResourcePropertiedObjectEditor.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -210,11 +210,6 @@
componentObject = getObject(componentObject);
-//System.out.println("setValue(" + obj + ", " + def + ", " + value + ")");
-//if (value != null) {
-// System.out.println("value obj type = " + value.getClass().getName());
-//}
-
if ( value == null ) {
//If the value is null, this most likely means that the user
//of the PropertiedObjectPanel has entered in the default
Modified: trunk/console/src/main/java/com/metamatrix/console/models/RuntimeMgmtManager.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/models/RuntimeMgmtManager.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/models/RuntimeMgmtManager.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -27,9 +27,11 @@
import java.util.Iterator;
import java.util.List;
+import com.metamatrix.common.log.LogManager;
import com.metamatrix.console.connections.ConnectionInfo;
import com.metamatrix.console.ui.util.property.PropertyProvider;
import com.metamatrix.console.util.ExternalException;
+import com.metamatrix.console.util.LogContexts;
import com.metamatrix.platform.admin.api.RuntimeStateAdminAPI;
import com.metamatrix.platform.admin.api.runtime.HostData;
import com.metamatrix.platform.admin.api.runtime.PSCData;
@@ -78,7 +80,7 @@
// get QueryManager listeners.
List qmListeners = ModelManager.getQueryManager(connection).getEventListeners();
- getAPI().bounceServer();
+ connection.getServerAdmin().bounceSystem(true);
ModelManager.removeConnection(connection);
connection.relogin();
@@ -91,7 +93,6 @@
qm.addManagerListener((ManagerListener) iter.next());
}
} catch (Exception theException) {
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("bounceServer", theException), //$NON-NLS-1$
theException);
@@ -146,7 +147,7 @@
return getAPI().getSystemState();
}
catch (Exception theException) {
- theException.printStackTrace();
+
throw new ExternalException(
formatErrorMsg("getServerState", theException), //$NON-NLS-1$
theException);
@@ -231,7 +232,7 @@
} // end if Hosts
} catch (Exception theException) {
- theException.printStackTrace();
+
throw new ExternalException(
formatErrorMsg("getHostNamesWhereServiceiSRunning", theException), //$NON-NLS-1$
theException);
@@ -254,7 +255,7 @@
getAPI().shutdownServer();
}
catch (Exception theException) {
- theException.printStackTrace();
+
throw new ExternalException(
formatErrorMsg("shutdownServer", theException), //$NON-NLS-1$
theException);
@@ -268,7 +269,7 @@
getAPI().startHost(theHost.getName());
}
catch (Exception theException) {
- theException.printStackTrace();
+
throw new ExternalException(
formatErrorMsg("startHost", "host=" + theHost, theException), //$NON-NLS-1$ //$NON-NLS-2$
theException);
@@ -282,7 +283,7 @@
getAPI().startProcess(theProcess.getHostName(), theProcess.getName());
}
catch (Exception theException) {
- theException.printStackTrace();
+
throw new ExternalException(
formatErrorMsg("startProcess", //$NON-NLS-1$
"process=" + theProcess, //$NON-NLS-1$
@@ -298,7 +299,7 @@
getAPI().startPSC(thePsc.getPscID());
}
catch (Exception theException) {
- theException.printStackTrace();
+
throw new ExternalException(
formatErrorMsg("startPsc", "psc=" + thePsc, theException), //$NON-NLS-1$ //$NON-NLS-2$
theException);
@@ -312,7 +313,7 @@
getAPI().restartService(theService.getServiceID());
}
catch (Exception theException) {
- theException.printStackTrace();
+
throw new ExternalException(
formatErrorMsg("startService", //$NON-NLS-1$
"service=" + theService, //$NON-NLS-1$
@@ -327,8 +328,8 @@
try {
getAPI().stopHost(theHost.getName());
}
- catch (Exception theException) {
- theException.printStackTrace();
+ catch (Exception ex) {
+ LogManager.logDetail(LogContexts.GENERAL, ex, ex.getMessage());
//don't rethrow: stopping the host you're connected to can cause an error
}
}
@@ -339,8 +340,8 @@
try {
getAPI().stopHostNow(theHost.getName());
}
- catch (Exception theException) {
- theException.printStackTrace();
+ catch (Exception ex) {
+ LogManager.logDetail(LogContexts.GENERAL, ex, ex.getMessage());
//don't rethrow: stopping the host you're connected to can cause an error
}
}
@@ -351,8 +352,8 @@
try {
getAPI().stopProcess(theProcess.getHostName(), theProcess.getName(), true);
}
- catch (Exception theException) {
- theException.printStackTrace();
+ catch (Exception ex) {
+ LogManager.logDetail(LogContexts.GENERAL, ex, ex.getMessage());
//don't rethrow: stopping the host you're connected to can cause an error
}
}
@@ -363,8 +364,8 @@
try {
getAPI().stopProcess(theProcess.getHostName(), theProcess.getName(), true);
}
- catch (Exception theException) {
- theException.printStackTrace();
+ catch (Exception ex) {
+ LogManager.logDetail(LogContexts.GENERAL, ex, ex.getMessage());
//don't rethrow: stopping the host you're connected to can cause an error
}
}
@@ -376,7 +377,6 @@
getAPI().stopPSC(thePsc.getPscID());
}
catch (Exception theException) {
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("stopPsc", "psc=" + thePsc, theException), //$NON-NLS-1$ //$NON-NLS-2$
theException);
@@ -390,7 +390,6 @@
getAPI().stopPSCNow(thePsc.getPscID());
}
catch (Exception theException) {
- theException.printStackTrace();
throw new ExternalException(
formatErrorMsg("stopPscNow", "psc=" + thePsc, theException), //$NON-NLS-1$ //$NON-NLS-2$
theException);
@@ -404,7 +403,7 @@
getAPI().stopService(theService.getServiceID());
}
catch (Exception theException) {
- theException.printStackTrace();
+
throw new ExternalException(
formatErrorMsg("stopService", //$NON-NLS-1$
"service=" + theService, //$NON-NLS-1$
@@ -420,7 +419,7 @@
getAPI().stopServiceNow(theService.getServiceID());
}
catch (Exception theException) {
- theException.printStackTrace();
+
throw new ExternalException(
formatErrorMsg("stopServiceNow", //$NON-NLS-1$
"service=" + theService, //$NON-NLS-1$
@@ -506,7 +505,7 @@
}
}
catch (Exception theException) {
- theException.printStackTrace();
+
throw new ExternalException(
formatErrorMsg("synchronizeServer", theException), //$NON-NLS-1$
theException);
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/dialog/ConsoleLogin.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/dialog/ConsoleLogin.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/dialog/ConsoleLogin.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -31,9 +31,6 @@
import javax.swing.AbstractButton;
-import com.metamatrix.api.exception.security.LogonException;
-import com.metamatrix.common.comm.exception.CommunicationException;
-import com.metamatrix.common.comm.exception.ConnectionException;
import com.metamatrix.console.ConsolePlugin;
import com.metamatrix.console.connections.ConnectionInfo;
import com.metamatrix.console.util.ExceptionUtility;
@@ -266,28 +263,13 @@
String url = getUrl();
String failureHdrMsg = ConsolePlugin.Util.getString("ConsoleLogin.failureHdrMsg"); //$NON-NLS-1$
- String logonExceptionMsg = ConsolePlugin.Util.getString("ConsoleLogin.logonFailureMsg"); //$NON-NLS-1$
- String serverNotRunningMsg = ConsolePlugin.Util.getString("ConsoleLogin.serverNotRunningMsg"); //$NON-NLS-1$
- String generalExceptionMsg = ConsolePlugin.Util.getString("ConsoleLogin.generalErrorMsg"); //$NON-NLS-1$
try {
connectionInfo = new ConnectionInfo(url, userName, password, APPLICATION_NAME);
connectionInfo.login();
result = LOGON_SUCCEEDED;
- } catch (ConnectionException ex) {
- ExceptionUtility.showMessage(failureHdrMsg, logonExceptionMsg, ex);
- } catch (CommunicationException ex) {
- if (ExceptionUtility.containsExceptionOfType(ex, LogonException.class)) {
- ExceptionUtility.showMessage(failureHdrMsg, logonExceptionMsg, ex);
- } else {
- ExceptionUtility.showMessage(failureHdrMsg, serverNotRunningMsg, ex);
- }
} catch (Throwable t) {
- String msg = null;
- if (t instanceof Exception) {
- msg = generalExceptionMsg;
- }
- ExceptionUtility.showMessage(failureHdrMsg, msg, t);
+ ExceptionUtility.showMessage(failureHdrMsg, t);
}
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/treetable/DynamicTreeTableModel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/treetable/DynamicTreeTableModel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/treetable/DynamicTreeTableModel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -36,6 +36,9 @@
import javax.swing.tree.TreeNode;
+import com.metamatrix.common.log.LogManager;
+import com.metamatrix.console.util.LogContexts;
+
/**
* An implementation of TreeTableModel that uses reflection to answer
* TableModel methods. This works off a handful
@@ -242,7 +245,7 @@
}
}
} catch (Throwable th) {
- System.out.println("exception: " + th); //$NON-NLS-1$
+ LogManager.logError(LogContexts.INITIALIZATION, th, th.getMessage());
}
if (found) {
// The value changed, fire an event to notify listeners.
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/util/ColumnSortInfo.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/util/ColumnSortInfo.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/util/ColumnSortInfo.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -62,19 +62,11 @@
try {
col = (EnhancedTableColumn)table.getColumn(csi[i].getColHeader());
} catch (Exception ex) {
-//System.err.println("exception occured:");
-//ex.printStackTrace();
}
if (col != null) {
boolean addToExistingSortColumns = (!firstSortCol);
if (csi[i].isAscending()) {
-//System.err.println("before call to setColumnSortedAscending(), col = " +
-// col.getIdentifier() + ", addToExistingSortColumns = " + addToExistingSortColumns +
-// ", table contents:");
-//System.err.println(StaticTableUtilities.tableContents(table));
table.setColumnSortedAscending(col, addToExistingSortColumns);
-//System.err.println("after call, table contents:");
-//System.err.println(StaticTableUtilities.tableContents(table));
} else {
table.setColumnSortedDescending(col, addToExistingSortColumns);
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/util/POPWithButtons.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/util/POPWithButtons.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/util/POPWithButtons.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -214,17 +214,6 @@
StaticUtilities.startWait( ViewManager.getMainFrame() );
PropertiedObject propObj = thePanel.getThePanel().getPropertiedObject();
-//Was attempting to save scroll bar position then reposition after reset, because
-//process of resetting was always repositioning scroll bar to the top, which is
-//annoying. But commenting out because nothing I've tried is working.
-//BWP 07/17/02
-// int scrollValue = -1;
-// JScrollBar scrollBar =
-// thePanel.getThePanel().getScrollPane().getVerticalScrollBar();
-// if (scrollBar != null) {
-// scrollValue = scrollBar.getValue();
-//System.err.println("scrollValue retrieved as " + scrollValue);
-// }
Iterator it = valuesMap.entrySet().iterator();
while (it.hasNext()) {
Map.Entry me = (Map.Entry)it.next();
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/util/property/GuiComponentFactory.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/util/property/GuiComponentFactory.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/util/property/GuiComponentFactory.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -23,24 +23,18 @@
//#############################################################################
package com.metamatrix.console.ui.util.property;
-import java.beans.BeanInfo;
-import java.beans.IndexedPropertyDescriptor;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
import java.beans.PropertyDescriptor;
-import java.lang.reflect.Method;
import java.text.ParseException;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import javax.swing.JButton;
import javax.swing.JComponent;
-import javax.swing.JPasswordField;
import javax.swing.JTextField;
import javax.swing.text.Document;
import com.metamatrix.core.util.StringUtil;
-
import com.metamatrix.toolbox.ui.Validator;
import com.metamatrix.toolbox.ui.widget.TextFieldWidget;
import com.metamatrix.toolbox.ui.widget.text.DefaultTextFieldModel;
@@ -138,109 +132,6 @@
///////////////////////////////////////////////////////////////////////////
/**
- * Creates a <code>JComponent</code> and initializes it's properties using
- * properties file(s).
- * @param theKey the properties file key
- * @param thePropProvider the provider that determines the file(s) to look
- * at
- * @return the newly created component
- * @throws IllegalArgumentException if either input parameter is
- * <code>null</code>, the key cannot be found, the value is not a
- * {@link String} object, the value is not a class name, or the class is
- * not an <code>instanceof JComponent</code>.
- * .
- */
- public static JComponent createComponent(
- String theKey,
- PropertyProvider thePropProvider) {
-
- if ((theKey == null) || (thePropProvider == null)) {
- throw new IllegalArgumentException(
- "Either the key <" + theKey + //$NON-NLS-1$
- ">, or the property provider <" + thePropProvider + //$NON-NLS-1$
- "> is null."); //$NON-NLS-1$
- }
-
- String className = thePropProvider.getString(theKey, true);
- if (className == null) {
- throw new IllegalArgumentException(
- "The key <" + theKey + "> cannot be found."); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- Class objClass = null;
- try {
- objClass = Class.forName(className);
- }
- catch (Exception theException) {
- throw new IllegalArgumentException(
- "The class <" + className + "> cannot be loaded."); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- if (!(JComponent.class.isAssignableFrom(objClass))) {
- throw new IllegalArgumentException(
- "Class is not instanceof JComponent <" + objClass + ">."); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- try {
- // create JComponent
- JComponent newComp = (JComponent)objClass.newInstance();
- setProperties(theKey, newComp, thePropProvider);
- return newComp;
- }
- catch (Exception theException) {
- theException.printStackTrace();
- return null;
- }
- }
-
- /**
- * Creates a <code>JPasswordField</code> and initializes it by using the
- * given type. If the type is not found by the provider, a default field
- * is returned. The default provider is used.
- * @param theType the data type key
- * @return the newly created JPasswordField
- * @throws IllegalArgumentException if input parameter is <code>null</code>
- * @see #createTextField(String, PropertyProvider)
- */
- public static JPasswordField createPasswordField(String theType) {
- return createPasswordField(theType, propProvider);
- }
-
- /**
- * Creates a <code>JPasswordField</code> and initializes it by using the
- * given type. If the type is not found by the provider, a default field
- * is returned.
- * @param theType the data type key
- * @param thePropProvider the provider that determines the file(s) to look
- * at for properties
- * @return the newly created JPasswordField
- * @throws IllegalArgumentException if either input parameter is
- * <code>null</code>
- * @see #createTextField(String, PropertyProvider)
- */
- public static JPasswordField createPasswordField(
- String theType,
- PropertyProvider thePropProvider) {
-
- if ((theType == null) || (thePropProvider == null)) {
- throw new IllegalArgumentException(
- "Either the type <" + theType + //$NON-NLS-1$
- ">, or the property provider <" + thePropProvider + //$NON-NLS-1$
- "> is null."); //$NON-NLS-1$
- }
-
- JPasswordField txf = new JPasswordField();
- DefaultTextFieldModel doc = new DefaultTextFieldModel();
- txf.setDocument(doc);
-
- ValidationProps props =
- getValidationProperties(theType, thePropProvider);
- new TextFieldInitializer(props, txf);
-
- return txf;
- }
-
- /**
* Creates a <code>TextFieldWidget</code> and initializes it by using the
* given type. If the type is not found by the provider, a default textfield
* is returned. The default provider is used.
@@ -293,34 +184,6 @@
}
/**
- * Creates a <code>TextFieldWidget</code> and initializes by using the given
- * type. Also, properties are set based on the given key. If the type is not
- * found by the provider, a default textfield is returned.
- * @param theType the data type key
- * @param theKey the properties key to use to set JavaBean properties
- * @param thePropProvider the provider that determines the file(s) to look
- * at for properties
- * @return the newly created TextFieldWidget
- * @throws IllegalArgumentException if any input parameter is
- * <code>null</code>
- * @see #createTextField(String, PropertyProvider)
- * @see #setProperties(String, JComponent, PropertyProvider)
- */
- public static TextFieldWidget createTextField(
- String theType,
- String theKey,
- PropertyProvider thePropProvider) {
-
- if (theKey == null) {
- throw new IllegalArgumentException("The key is null."); //$NON-NLS-1$
- }
-
- TextFieldWidget txf = createTextField(theType, thePropProvider);
- setProperties(theKey, txf, thePropProvider);
- return txf;
- }
-
- /**
* Indicates if consecutive spaces should be collapsed to one space.
* @param theType the data type whose information is being requested
* @param thePropProvider the provider that determines the file(s) to look
@@ -474,76 +337,6 @@
true);
}
- /**
- * Sets the JavaBean properties of a component based on entries in one or
- * more properties files.
- * @param theKey the properties key to used as a prefix to set JavaBean
- * properties
- * @param theComponent the component whose properties are being set
- * @param thePropProvider the provider that determines the file(s) to look
- * at for properties
- * @throws IllegalArgumentException if any input parameter is
- * <code>null</code>
- */
- public static void setProperties(
- String theKey,
- JComponent theComponent,
- PropertyProvider thePropProvider) {
-
- if ((theKey == null) ||
- (thePropProvider == null) ||
- (theComponent == null)) {
- throw new IllegalArgumentException(
- "Either the key <" + theKey + //$NON-NLS-1$
- ">, the property provider <" + thePropProvider + //$NON-NLS-1$
- ">, or the component <" + theComponent + //$NON-NLS-1$
- "> is null."); //$NON-NLS-1$
- }
-
- Class objClass = theComponent.getClass();
- PropertyDescriptor[] propDescriptors =
- (PropertyDescriptor[])descriptorMap.get(objClass);
- if (!descriptorMap.containsKey(objClass)) {
- try {
- BeanInfo beanInfo = Introspector.getBeanInfo(objClass);
- propDescriptors = beanInfo.getPropertyDescriptors();
- }
- catch (IntrospectionException theException) {}
- descriptorMap.put(objClass, propDescriptors);
- }
-
- if (propDescriptors != null) {
- for (int i=0; i<propDescriptors.length; i++) {
- Method setMethod = null;
- if (propDescriptors[i] instanceof IndexedPropertyDescriptor) {
- IndexedPropertyDescriptor ipd =
- (IndexedPropertyDescriptor)propDescriptors[i];
- setMethod = ipd.getIndexedWriteMethod();
- }
- else {
- setMethod = propDescriptors[i].getWriteMethod();
- }
-
- //
- // invoke method if property being set in properties file
- String prop = propDescriptors[i].getName();
- String propSuffix = theKey + SEPARATOR + prop;
- // see if property is being set by a value in properties file
- Object value = thePropProvider.getObject(propSuffix);
- if (value != null) {
- try {
- setMethod.invoke(theComponent, new Object[] {value});
- }
- catch (Exception theException) {}
- }
- }
- }
- }
-
- ///////////////////////////////////////////////////////////////////////////
- // INNER CLASSES
- ///////////////////////////////////////////////////////////////////////////
-
private static class ValidationProps {
public boolean collapse = true;
public int cols = 15;
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/authorization/ProvidersMain.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/authorization/ProvidersMain.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/authorization/ProvidersMain.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -85,6 +85,7 @@
import com.metamatrix.console.util.LogContexts;
import com.metamatrix.console.util.Refreshable;
import com.metamatrix.console.util.StaticUtilities;
+import com.metamatrix.core.MetaMatrixRuntimeException;
import com.metamatrix.toolbox.ui.UIDefaults;
import com.metamatrix.toolbox.ui.widget.ButtonWidget;
import com.metamatrix.toolbox.ui.widget.Splitter;
@@ -386,22 +387,11 @@
}
private List getAuthenticationOrder() {
- List domainOrder = null;
-
try {
- domainOrder = getGroupsManager().getDomainNames();
- } catch (AuthorizationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (ComponentNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (ExternalException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ return getGroupsManager().getDomainNames();
+ } catch (Exception e) {
+ throw new MetaMatrixRuntimeException(e);
}
-
- return domainOrder;
}
private void setAuthenticationOrder(List authOrder) {
@@ -411,15 +401,8 @@
// Updates the next startup configuration
updateConfiguration(authOrder);
- } catch (AuthorizationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (ComponentNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (ExternalException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ } catch (Exception e) {
+ throw new MetaMatrixRuntimeException(e);
}
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/connector/ConnectorPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/connector/ConnectorPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/connector/ConnectorPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -385,7 +385,6 @@
}
} catch (Exception theException) {
- theException.printStackTrace();
DeployPkgUtils.getString("ecp.msg.exporterrordetail", //$NON-NLS-1$
new Object[] {selectedConnectorName, filename});
ExceptionUtility.showMessage("Unable to Export Connector Type", //$NON-NLS-1$
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbinding/ConnectorBindingPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbinding/ConnectorBindingPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbinding/ConnectorBindingPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -610,8 +610,6 @@
xmlUtil.exportConnectorBindings(fileOutput, bindingArray, typeArray, props);
} catch (Exception theException) {
- theException.printStackTrace();
-
ExceptionUtility.showMessage("Unable to Export Connector Binding", //$NON-NLS-1$
theException);
LogManager.logError(LogContexts.CONNECTOR_BINDINGS, theException, "Error exporting connector bindings"); //$NON-NLS-1$
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/CreatePSCPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/CreatePSCPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/CreatePSCPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -151,7 +151,6 @@
if (serviceNames == null) {
Exception theException = new Exception("Null ServiceNames"); //$NON-NLS-1$
- theException.printStackTrace();
LogManager.logError(
LogContexts.USERS,
theException,
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/DeployMainPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/DeployMainPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/DeployMainPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -564,7 +564,6 @@
props.put(ConfigurationPropertyNames.USER_CREATED_BY, userName);
xmlUtil.exportConfiguration(fileOutput, exportObjs, props);
} catch (Exception theException) {
- theException.printStackTrace();
String detail =
DeployPkgUtils.getString("dmp.msg.exporterrordetail", //$NON-NLS-1$
new Object[] {configId, filename});
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/PscDefinitionPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/PscDefinitionPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/PscDefinitionPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -492,13 +492,11 @@
List pscServiceNames = null;
if (pscDef.getComponentTypeID().getName().equals(MetaMatrixProductVersion.CONNECTOR_PRODUCT_TYPE_NAME)) {
-// System.out.println("NEW PSC - use bindings");
Collection bindings = config.getConnectorBindings();
// get all the names of the available bindings to choose from
if (bindings != null) {
-// System.out.println("NEW PSC - bindings found " + bindings.size());
pscServiceNames = new ArrayList(bindings.size());
Iterator itCbs = bindings.iterator();
@@ -507,7 +505,6 @@
pscServiceNames.add(cb.getID());
}
} else {
-// System.out.println("NEW PSC - no bindings found ");
pscServiceNames = Collections.EMPTY_LIST;
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/UpdatePSCPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/UpdatePSCPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/UpdatePSCPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -112,7 +112,6 @@
this.serviceNames = serviceNames;
JPanel mainPanel = new JPanel(new BorderLayout());
- // System.out.println("LABEL: " + theLabelId);
JPanel pnl = new JPanel();
JLabel lbl = new LabelWidget(DeployPkgUtils.getString(theLabelId));
pnl.add(lbl);
@@ -179,7 +178,6 @@
if (serviceNames == null) {
Exception theException = new Exception("Null ServiceNames"); //$NON-NLS-1$
- theException.printStackTrace();
LogManager.logError(
LogContexts.USERS,
theException,
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements/DataNodeAuthorizationsControl.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements/DataNodeAuthorizationsControl.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements/DataNodeAuthorizationsControl.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -30,7 +30,6 @@
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
-import java.util.Date;
import java.util.Enumeration;
import java.util.Iterator;
@@ -42,15 +41,15 @@
import javax.swing.JRadioButton;
import javax.swing.JScrollPane;
+import com.metamatrix.common.log.LogManager;
import com.metamatrix.console.ui.layout.ConsoleMainFrame;
import com.metamatrix.console.ui.tree.TreePathExpansion;
+import com.metamatrix.console.util.LogContexts;
import com.metamatrix.console.util.StaticTreeUtilities;
import com.metamatrix.console.util.StaticUtilities;
-
import com.metamatrix.platform.admin.api.PermissionNode;
import com.metamatrix.platform.admin.api.PermissionTreeView;
import com.metamatrix.platform.security.api.AuthorizationActions;
-
import com.metamatrix.toolbox.ui.widget.ButtonWidget;
import com.metamatrix.toolbox.ui.widget.CheckBox;
import com.metamatrix.toolbox.ui.widget.LabelWidget;
@@ -107,21 +106,8 @@
canModifyEntitlements, rootVisible);
TreePathExpansion[] tpe = null;
try {
- Date startingTime = new Date();
tpe = StaticTreeUtilities.expansionState(treeTable.getTree());
- Date endingTime = new Date();
- long startingTimeLong = startingTime.getTime();
- long endingTimeLong = endingTime.getTime();
- long timeDiffLong = endingTimeLong - startingTimeLong;
- double timeDiff = ((double)timeDiffLong) / 1000;
- if (timeDiff >= 2.0) {
-// String message = "DNAC..setTreeView() expansionState() call took "
-// + timeDiff + " seconds";
-// LogManager.logInfo(LogContexts.ENTITLEMENTS, message);
-//System.err.println(message);
- }
} catch (Exception ex) {
-//System.err.println("expansionState() threw exception of " + ex);
}
createComponent();
if (tpe != null) {
@@ -269,7 +255,7 @@
}
DataNodesTreeNode changedNode = treeTable.anyAuthorizationsChangesMade();
if (changedNode != null) {
- System.err.println("missed resetting node " + changedNode +
+ LogManager.logError(LogContexts.INITIALIZATION, "missed resetting node " + changedNode +
", initial CRUD states: " + changedNode.getInitialCreateState() +
changedNode.getInitialReadState() + changedNode.getInitialUpdateState() +
changedNode.getInitialDeleteState() + ", current CRUD states: " +
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements/DataNodesTreeModel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements/DataNodesTreeModel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements/DataNodesTreeModel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -75,7 +75,6 @@
//for (int ix = 0; ix < actualLabels.length; ix++) {
// actualLabelsStr += " " + actualLabels[ix];
//}
-//System.err.println("allowed actions for node " + curNodePDN.getName() + ": " + allowedLabelsStr + ", actual: " + actualLabelsStr);
java.util.List children = treeView.getChildren((PermissionNode)curNode);
if (children.size() > 0) {
@@ -135,7 +134,6 @@
"createDefaultTreeModelFromTreeView() is " + timeDiff +
" seconds for model containing " + numNodes + " nodes";
LogManager.logInfo(LogContexts.ENTITLEMENTS, message);
-//System.err.println(message);
}
return ourModel;
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/queries/QueryPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/queries/QueryPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/queries/QueryPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -59,7 +59,6 @@
import com.metamatrix.console.util.AutoRefreshable;
import com.metamatrix.console.util.AutoRefresher;
import com.metamatrix.console.util.ExceptionUtility;
-import com.metamatrix.console.util.ExternalException;
import com.metamatrix.console.util.LogContexts;
import com.metamatrix.console.util.StaticProperties;
import com.metamatrix.console.util.StaticUtilities;
@@ -396,11 +395,8 @@
}
};
StaticUtilities.invokeLaterSafe(runnable);
-
- } catch (ExternalException ee) {
- ExceptionUtility.showUnspecifiedFailureMessage(ConsolePlugin.Util.getString("QueryPanel.Could_not_refresh_query_table_1"), ee); //$NON-NLS-1$
} catch (Throwable e) {
- ExceptionUtility.showUnspecifiedFailureMessage(ConsolePlugin.Util.getString("QueryPanel.Could_not_refresh_query_table_1"), e); //$NON-NLS-1$
+ ExceptionUtility.showMessage(ConsolePlugin.Util.getString("QueryPanel.Could_not_refresh_query_table_1"), e); //$NON-NLS-1$
} finally {
StaticUtilities.endWait(ConsoleMainFrame.getInstance());
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/queries/QueryRequestPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/queries/QueryRequestPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/queries/QueryRequestPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -210,7 +210,6 @@
ModelManager.getQueryManager(connection).cancelQueryRequests(
getCurrentSelections());
} catch (Exception theException) {
- theException.printStackTrace();
throw new ExternalException(theException);
}
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/syslog/SysLogPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/syslog/SysLogPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/syslog/SysLogPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -1056,7 +1056,6 @@
path);
UserPreferences.getInstance().saveChanges();
} catch (Exception theException) {
- theException.printStackTrace();
ExceptionUtility.showMessage(theException.getMessage(),
theException);
LogManager.logError(LogContexts.SYSTEMLOGGING,
@@ -1103,7 +1102,6 @@
String consoleLogDir = StaticProperties.getLogDirectory().getAbsolutePath();
ZipFileUtil.addAll(new File(filename), consoleLogDir, "console"); //$NON-NLS-1$
} catch (Exception theException) {
- theException.printStackTrace();
ExceptionUtility.showMessage(theException.getMessage(), theException);
LogManager.logError(LogContexts.SYSTEMLOGGING, theException, getClass() + ":exportLogs"); //$NON-NLS-1$
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/transactions/TransactionsPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/transactions/TransactionsPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/transactions/TransactionsPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -201,7 +201,6 @@
*/
public String getName()
{
- //System.out.println( "TransactionsPanel.getName..TOP" );
return StaticProperties.DATA_TRANSACTION;
}
@@ -211,7 +210,6 @@
*/
public void setAutoRefreshEnabled( boolean b )
{
- //System.out.println( "TransactionsPanel.setAutoRefreshEnabled..TOP to: " + b );
arRefresher.setAutoRefreshEnabled( b );
}
@@ -221,7 +219,6 @@
*/
public void setRefreshRate( int iRate )
{
- //System.out.println( "TransactionsPanel.setRefreshRate..TOP to: " + iRate );
arRefresher.setRefreshRate( iRate );
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/users/NewGroupsWizardSelectionPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/users/NewGroupsWizardSelectionPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/users/NewGroupsWizardSelectionPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -56,6 +56,7 @@
import com.metamatrix.console.ui.util.WizardInterface;
import com.metamatrix.console.ui.util.property.TypeConstants;
import com.metamatrix.console.util.ExternalException;
+import com.metamatrix.core.MetaMatrixRuntimeException;
import com.metamatrix.platform.security.api.MetaMatrixPrincipal;
import com.metamatrix.platform.security.api.MetaMatrixPrincipalName;
import com.metamatrix.toolbox.ui.widget.AccumulatorPanel;
@@ -217,15 +218,8 @@
Collection allDomains = null;
try {
allDomains = getGroupsManager().getDomainNames();
- } catch (AuthorizationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (ComponentNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (ExternalException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ } catch (Exception e) {
+ throw new MetaMatrixRuntimeException(e);
}
if(allDomains!=null) {
Iterator iter = allDomains.iterator();
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/CreateVDBPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/CreateVDBPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/CreateVDBPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -1407,7 +1407,6 @@
} catch (VirtualDatabaseDoesNotExistException dne) {
return null;
} catch (Exception ex) {
- ex.printStackTrace();
String msg = "An error occurred retrieving VDB version information"; //$NON-NLS-1$
LogManager.logError("Information Retrieval Error", ex, msg); //$NON-NLS-1$
ExceptionUtility.showMessage(msg, ex);
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/EntitlementMigrationReportSummaryPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/EntitlementMigrationReportSummaryPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/EntitlementMigrationReportSummaryPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -172,7 +172,6 @@
}
public void actionPerformed(ActionEvent ev) {
-System.err.println("in actionPerformed() for button " + subscript); //$NON-NLS-1$
panel.detailsRequestedForEntitlement(subscript);
}
}//end DetailButtonActionListener
@@ -207,11 +206,6 @@
this.setRowHeight(30);
}
- public Class getColumnClass(int index) {
-System.err.println("in table's getColumnClass() method"); //$NON-NLS-1$
- return super.getColumnClass(index);
- }
-
/**
* If the point is over the "details" column in a displayed row of the
* table, then return that row number, else -1.
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbAssignConnBindPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbAssignConnBindPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbAssignConnBindPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -126,7 +126,7 @@
tblModels.setSortable(true);
setInitialTableSorting();
} catch (Exception ex) {
- ex.printStackTrace();
+ LogManager.logError(LogContexts.INITIALIZATION, ex, ex.getMessage());
}
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbConnBindPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbConnBindPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbConnBindPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -44,6 +44,7 @@
import javax.swing.JTextField;
import javax.swing.border.Border;
+import com.metamatrix.common.log.LogManager;
import com.metamatrix.console.connections.ConnectionInfo;
import com.metamatrix.console.models.ConnectorManager;
import com.metamatrix.console.models.ModelManager;
@@ -53,6 +54,7 @@
import com.metamatrix.console.ui.views.deploy.event.ConfigurationChangeEvent;
import com.metamatrix.console.ui.views.deploy.event.ConfigurationChangeListener;
import com.metamatrix.console.util.ExceptionUtility;
+import com.metamatrix.console.util.LogContexts;
import com.metamatrix.core.util.StringUtil;
import com.metamatrix.metadata.runtime.api.Model;
import com.metamatrix.metadata.runtime.api.VirtualDatabase;
@@ -107,7 +109,7 @@
this.frParent = ViewManager.getMainFrame();
jbInit();
} catch (Exception ex) {
- ex.printStackTrace();
+ LogManager.logError(LogContexts.INITIALIZATION, ex, ex.getMessage());
}
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbDetailPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbDetailPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbDetailPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -22,24 +22,36 @@
package com.metamatrix.console.ui.views.vdb;
-import java.awt.*;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.text.SimpleDateFormat;
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
import javax.swing.border.Border;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
+import com.metamatrix.common.log.LogManager;
import com.metamatrix.console.connections.ConnectionInfo;
import com.metamatrix.console.models.ModelManager;
import com.metamatrix.console.models.VdbManager;
import com.metamatrix.console.util.ExceptionUtility;
+import com.metamatrix.console.util.LogContexts;
import com.metamatrix.console.util.StaticUtilities;
import com.metamatrix.metadata.runtime.api.VirtualDatabase;
import com.metamatrix.metadata.runtime.api.VirtualDatabaseID;
-import com.metamatrix.toolbox.ui.widget.*;
+import com.metamatrix.toolbox.ui.widget.ButtonWidget;
+import com.metamatrix.toolbox.ui.widget.LabelWidget;
+import com.metamatrix.toolbox.ui.widget.TextFieldWidget;
import com.metamatrix.toolbox.ui.widget.text.DefaultTextFieldModel;
public class VdbDetailPanel extends JPanel implements
@@ -91,7 +103,7 @@
jbInit();
addListeners();
} catch (Exception ex) {
- ex.printStackTrace();
+ LogManager.logError(LogContexts.INITIALIZATION, ex, ex.getMessage());
}
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbEditConnBindDlg.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbEditConnBindDlg.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbEditConnBindDlg.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -32,10 +32,12 @@
import javax.swing.JDialog;
+import com.metamatrix.common.log.LogManager;
import com.metamatrix.console.connections.ConnectionInfo;
import com.metamatrix.console.models.ModelManager;
import com.metamatrix.console.models.VdbManager;
import com.metamatrix.console.util.ExceptionUtility;
+import com.metamatrix.console.util.LogContexts;
import com.metamatrix.metadata.runtime.api.Model;
import com.metamatrix.metadata.runtime.api.VirtualDatabaseID;
import com.metamatrix.toolbox.ui.widget.DialogPanel;
@@ -57,7 +59,7 @@
try {
init();
} catch (Exception ex) {
- ex.printStackTrace();
+ LogManager.logError(LogContexts.INITIALIZATION, ex, ex.getMessage());
}
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbEntitlementsPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbEntitlementsPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbEntitlementsPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -41,12 +41,14 @@
import javax.swing.JTextField;
import javax.swing.border.Border;
+import com.metamatrix.common.log.LogManager;
import com.metamatrix.console.connections.ConnectionInfo;
import com.metamatrix.console.models.ModelManager;
import com.metamatrix.console.models.VdbManager;
import com.metamatrix.console.ui.ViewManager;
import com.metamatrix.console.ui.views.DefaultConsoleTableComparator;
import com.metamatrix.console.util.ExceptionUtility;
+import com.metamatrix.console.util.LogContexts;
import com.metamatrix.metadata.runtime.api.VirtualDatabase;
import com.metamatrix.metadata.runtime.api.VirtualDatabaseID;
import com.metamatrix.platform.security.api.AuthorizationPolicyID;
@@ -94,7 +96,7 @@
this.frParent = ViewManager.getMainFrame();
jbInit();
} catch (Exception ex) {
- ex.printStackTrace();
+ LogManager.logError(LogContexts.INITIALIZATION, ex, ex.getMessage());
}
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbMainPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbMainPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbMainPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -78,6 +78,7 @@
import com.metamatrix.console.util.ExceptionUtility;
import com.metamatrix.console.util.Refreshable;
import com.metamatrix.console.util.StaticUtilities;
+import com.metamatrix.core.MetaMatrixRuntimeException;
import com.metamatrix.core.vdb.VDBStatus;
import com.metamatrix.metadata.runtime.api.VirtualDatabase;
import com.metamatrix.metadata.runtime.api.VirtualDatabaseID;
@@ -1061,7 +1062,7 @@
try {
vdbSelected = (VirtualDatabase)getDisplayedVdbs().get(iRow);
} catch (Exception e) {
- e.printStackTrace();
+ throw new MetaMatrixRuntimeException(e);
}
setSelectedVdb(vdbSelected);
alignVisibleDetailPanelWithTableChoice();
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbModelsPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbModelsPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbModelsPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -40,11 +40,13 @@
import javax.swing.JTextField;
import javax.swing.border.Border;
+import com.metamatrix.common.log.LogManager;
import com.metamatrix.console.connections.ConnectionInfo;
import com.metamatrix.console.models.ModelManager;
import com.metamatrix.console.models.VdbManager;
import com.metamatrix.console.ui.views.DefaultConsoleTableComparator;
import com.metamatrix.console.util.ExceptionUtility;
+import com.metamatrix.console.util.LogContexts;
import com.metamatrix.metadata.runtime.api.Model;
import com.metamatrix.metadata.runtime.api.VirtualDatabase;
import com.metamatrix.metadata.runtime.api.VirtualDatabaseID;
@@ -80,7 +82,7 @@
try {
init();
} catch (Exception ex) {
- ex.printStackTrace();
+ LogManager.logError(LogContexts.INITIALIZATION, ex, ex.getMessage());
}
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbRoleOptionsPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbRoleOptionsPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbRoleOptionsPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -36,9 +36,11 @@
import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
+import com.metamatrix.common.log.LogManager;
import com.metamatrix.console.ConsolePlugin;
import com.metamatrix.console.ui.util.BasicWizardSubpanelContainer;
import com.metamatrix.console.ui.util.WizardInterface;
+import com.metamatrix.console.util.LogContexts;
import com.metamatrix.metadata.runtime.api.VirtualDatabase;
import com.metamatrix.toolbox.ui.widget.ButtonWidget;
@@ -93,8 +95,8 @@
try {
jbInit();
setWizardStuff(stepNum);
- } catch(Exception e) {
- e.printStackTrace();
+ } catch(Exception ex) {
+ LogManager.logError(LogContexts.INITIALIZATION, ex, ex.getMessage());
}
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbSetStatusDlg.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbSetStatusDlg.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbSetStatusDlg.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -34,11 +34,13 @@
import javax.swing.JPanel;
import javax.swing.JTextField;
+import com.metamatrix.common.log.LogManager;
import com.metamatrix.console.connections.ConnectionInfo;
import com.metamatrix.console.models.ModelManager;
import com.metamatrix.console.models.VdbManager;
import com.metamatrix.console.ui.ViewManager;
import com.metamatrix.console.util.ExceptionUtility;
+import com.metamatrix.console.util.LogContexts;
import com.metamatrix.core.vdb.VDBStatus;
import com.metamatrix.metadata.runtime.api.VirtualDatabase;
import com.metamatrix.metadata.runtime.api.VirtualDatabaseID;
@@ -70,7 +72,7 @@
try {
init();
} catch (Exception ex) {
- ex.printStackTrace();
+ LogManager.logError(LogContexts.INITIALIZATION, ex, ex.getMessage());
}
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizardConfirmPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizardConfirmPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizardConfirmPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -30,8 +30,10 @@
import javax.swing.JPanel;
import javax.swing.JTextArea;
+import com.metamatrix.common.log.LogManager;
import com.metamatrix.console.ui.util.BasicWizardSubpanelContainer;
import com.metamatrix.console.ui.util.WizardInterface;
+import com.metamatrix.console.util.LogContexts;
import com.metamatrix.core.vdb.VDBStatus;
import com.metamatrix.metadata.runtime.api.VirtualDatabase;
import com.metamatrix.toolbox.ui.widget.CheckBox;
@@ -83,8 +85,8 @@
try {
jbInit();
setWizardStuff(stepNum);
- } catch (Exception e) {
- e.printStackTrace();
+ } catch (Exception ex) {
+ LogManager.logError(LogContexts.INITIALIZATION, ex, ex.getMessage());
}
}
@@ -99,8 +101,8 @@
try {
jbInit();
setWizardStuff(stepNum);
- } catch (Exception e) {
- e.printStackTrace();
+ } catch (Exception ex) {
+ LogManager.logError(LogContexts.INITIALIZATION, ex, ex.getMessage());
}
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizardEditConnBindPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizardEditConnBindPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizardEditConnBindPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -39,6 +39,7 @@
import javax.swing.JPanel;
import javax.swing.JRadioButton;
+import com.metamatrix.common.log.LogManager;
import com.metamatrix.common.vdb.api.VDBDefn;
import com.metamatrix.console.connections.ConnectionInfo;
import com.metamatrix.console.models.ModelManager;
@@ -46,6 +47,7 @@
import com.metamatrix.console.ui.util.BasicWizardSubpanelContainer;
import com.metamatrix.console.ui.util.WizardInterface;
import com.metamatrix.console.util.ExceptionUtility;
+import com.metamatrix.console.util.LogContexts;
import com.metamatrix.metadata.runtime.api.VirtualDatabase;
import com.metamatrix.vdb.runtime.BasicModelInfo;
@@ -78,7 +80,7 @@
try {
init();
} catch (Exception ex) {
- ex.printStackTrace();
+ LogManager.logError(LogContexts.INITIALIZATION, ex, ex.getMessage());
}
}
@@ -92,7 +94,7 @@
try {
init();
} catch (Exception ex) {
- ex.printStackTrace();
+ LogManager.logError(LogContexts.INITIALIZATION, ex, ex.getMessage());
}
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizardEntitlementsPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizardEntitlementsPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizardEntitlementsPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -100,7 +100,7 @@
try {
jbInit(stepNum);
} catch (Exception ex) {
- ex.printStackTrace();
+ LogManager.logError(LogContexts.INITIALIZATION, ex, ex.getMessage());
}
setSourceVdb(vdb);
@@ -578,7 +578,6 @@
try {
getEntitlementMigrationReport().writeReport(result.getNamespace());
} catch (Exception theException) {
- theException.printStackTrace();
ExceptionUtility.showMessage(theException.getMessage(), theException);
LogManager.logError(LogContexts.SYSTEMLOGGING, theException, getClass() + ":writeFile");
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizardEntitlementsSelectPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizardEntitlementsSelectPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizardEntitlementsSelectPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -138,8 +138,8 @@
try {
jbInit();
setWizardStuff(stepNum);
- } catch(Exception e) {
- e.printStackTrace();
+ } catch(Exception ex) {
+ LogManager.logError(LogContexts.INITIALIZATION, ex, ex.getMessage());
}
}
@@ -169,8 +169,8 @@
try {
jbInit();
setWizardStuff(stepNum);
- } catch(Exception e) {
- e.printStackTrace();
+ } catch(Exception ex) {
+ LogManager.logError(LogContexts.INITIALIZATION, ex, ex.getMessage());
}
}
@@ -194,8 +194,8 @@
try {
jbInit();
setWizardStuff(stepNum);
- } catch(Exception e) {
- e.printStackTrace();
+ } catch(Exception ex) {
+ LogManager.logError(LogContexts.INITIALIZATION, ex, ex.getMessage());
}
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizardIdPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizardIdPanel.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizardIdPanel.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -33,11 +33,13 @@
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
+import com.metamatrix.common.log.LogManager;
import com.metamatrix.console.ui.util.BasicWizardSubpanelContainer;
import com.metamatrix.console.ui.util.WizardInterface;
import com.metamatrix.console.ui.util.property.GuiComponentFactory;
import com.metamatrix.console.ui.util.property.TypeConstants;
import com.metamatrix.console.util.ExceptionUtility;
+import com.metamatrix.console.util.LogContexts;
import com.metamatrix.metadata.runtime.api.VirtualDatabase;
@@ -83,7 +85,7 @@
try {
jbInit();
} catch (Exception ex) {
- ex.printStackTrace();
+ LogManager.logError(LogContexts.INITIALIZATION, ex, ex.getMessage());
}
setSourceVdb(vdb);
@@ -104,7 +106,7 @@
try {
jbInit();
} catch (Exception ex) {
- ex.printStackTrace();
+ LogManager.logError(LogContexts.INITIALIZATION, ex, ex.getMessage());
}
this.enableForwardButton(false);
Modified: trunk/console/src/main/java/com/metamatrix/console/util/AutoRefresher.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/util/AutoRefresher.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/util/AutoRefresher.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -163,12 +163,8 @@
* @see AutoRefresher#startTimer
*/
public void refresh(final boolean setIsStale) {
- //System.out.println("AutoRefresher.refresh...TOP, in: " + refTarget.getName());
- //System.out.println("AutoRefresher.refresh...TOP, setIsStale is: " + setIsStale);
-
// Quit if this panel is not visible
if (!isTargetCurrentPanel(refTarget)) {
- //System.out.println("AutoRefresher.refresh...skipping refresh, this panel not visible, in: " + refTarget.getName());
return;
}
@@ -178,14 +174,12 @@
try {
// Quit if session is not valid
if (!ModelManager.getSessionManager(connection).isSignedOnUserSessionValid()) {
- //System.out.println("AutoRefresher.refresh...skipping refresh, SESSION HAS DIED" + refTarget.getName());
setAutoRefreshEnabled(false);
return;
}
getTimer().stop();
if (setIsStale) {
- //System.out.println("AutoRefresher.refresh...About to call refTarget.refresh() inside an InvokeLater");
refTarget.refresh();
}
} catch (Exception e) {
@@ -195,7 +189,6 @@
if (isAutoRefreshEnabled()) {
- //System.out.println("AutoRefresher.refresh...AutoRefresh enabled, about to start timer, in: " + refTarget.getName());
startTimer();
}
}
Modified: trunk/console/src/main/java/com/metamatrix/console/util/DaysHoursMinutesSeconds.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/util/DaysHoursMinutesSeconds.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/util/DaysHoursMinutesSeconds.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -30,18 +30,6 @@
*/
public class DaysHoursMinutesSeconds implements Serializable {
- public static void printMethodCallDurationMessage(String methodName,
- Date startingTime, Date endingTime) {
- long startingTimeAsLong = startingTime.getTime();
- long endingTimeAsLong = endingTime.getTime();
- long timeDiffInMilliseconds = endingTimeAsLong - startingTimeAsLong;
- DaysHoursMinutesSeconds dhms = new DaysHoursMinutesSeconds(
- timeDiffInMilliseconds);
- String timeAsString = dhms.toDisplayString(true);
- String message = ">>>>Call to " + methodName + " took " + timeAsString;
- System.err.println(message);
- }
-
//Number of days
private int days;
Modified: trunk/console/src/main/java/com/metamatrix/console/util/ExceptionUtility.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/util/ExceptionUtility.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/util/ExceptionUtility.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -34,11 +34,14 @@
import com.metamatrix.api.exception.MultipleException;
import com.metamatrix.api.exception.security.AuthorizationException;
import com.metamatrix.api.exception.security.LogonException;
+import com.metamatrix.client.ExceptionUtil;
import com.metamatrix.common.application.exception.ApplicationInitializationException;
+import com.metamatrix.common.comm.exception.CommunicationException;
+import com.metamatrix.common.comm.exception.ConnectionException;
+import com.metamatrix.common.log.LogManager;
import com.metamatrix.console.ConsolePlugin;
import com.metamatrix.console.ui.ViewManager;
import com.metamatrix.console.ui.dialog.ErrorDialog;
-import com.metamatrix.core.MetaMatrixCoreException;
import com.metamatrix.core.MetaMatrixRuntimeException;
import com.metamatrix.toolbox.preference.UserPreferences;
@@ -61,98 +64,77 @@
public static final String TITLE_DEFAULT = ConsolePlugin.Util.getString("ExceptionUtility.titleDefMsg"); //$NON-NLS-1$
public static void showMessage(String text, String comment, Throwable thr) {
- boolean messageDisplayed = false;
- Exception ex = null;
- if (thr != null) {
+ LogManager.logError(LogContexts.GENERAL, thr, text + " " + comment); //$NON-NLS-1$
+ showMessage(text, comment, thr, thr);
+ }
+
+ private static void showMessage(String text, String comment, Throwable thr, Throwable root) {
+
+ if (thr == null) {
+ showUnspecifiedFailureMessage(text, comment, root);
+ return;
+ }
+
+ if (thr instanceof NoClassDefFoundError) {
+ comment = "Unable to locate class for: " + comment; //$NON-NLS-1$
+ showUnspecifiedFailureMessage(text, comment, thr);
+ return;
+ }
+
+ if (thr instanceof ComponentNotFoundException) {
+ showCompNotFoundFailureMessage(text, comment, root);
+ return;
+ }
- if (thr instanceof NoClassDefFoundError) {
- comment = "Unable to locate class for: " + comment; //$NON-NLS-1$
- showUnspecifiedFailureMessage(text, comment, thr);
- }
-
- if (thr instanceof Exception) {
- ex = (Exception)thr;
+ if ((ExceptionUtility.containsExceptionContainingString(thr,
+ "class not compatible", true) != null) || //$NON-NLS-1$
+ (ExceptionUtility.containsExceptionContainingString(thr,
+ "unmarshal", true) != null)) { //$NON-NLS-1$
+ showUnavailableMessage(text + comment, root);
+ return;
+ }
+
+ if (thr instanceof ConnectionException) {
+ showExternalFailureMessage(text, ConsolePlugin.Util.getString("ConsoleLogin.logonFailureMsg"), thr); //$NON-NLS-1$
+ return;
+ }
+
+ if (thr instanceof CommunicationException) {
+ UnknownHostException ex = ExceptionUtil.getExceptionOfType(thr, UnknownHostException.class);
+ if (ex != null) {
+ showUnknownHostException(text + comment, MSG_HOST_NOT_FOUND + ": Unknown host: " + ex.getMessage(), ex ); //$NON-NLS-1$
+ return;
+ }
+ if (ExceptionUtility.containsExceptionOfType(thr, LogonException.class)) {
+ showExternalFailureMessage(text, ConsolePlugin.Util.getString("ConsoleLogin.logonFailureMsg"), thr); //$NON-NLS-1$
+ return;
}
-
- if (ex instanceof RuntimeExternalException) {
- ex= ((RuntimeExternalException)ex).getTheException();
+ showExternalFailureMessage(text, ConsolePlugin.Util.getString("ConsoleLogin.serverNotRunningMsg"), thr); //$NON-NLS-1$
+ return;
+ }
+
+ if( thr instanceof UnknownHostException) {
+ showUnknownHostException(text, MSG_HOST_NOT_FOUND + ": Unknown host: " + thr.getMessage(), thr ); //$NON-NLS-1$
+ return;
+ }
+
+ if (thr instanceof AuthorizationException || thr instanceof LogonException) {
+ showAuthorizationFailureMessage(text, comment, thr);
+ return;
+ }
+
+ if (thr instanceof ApplicationInitializationException) {
+ Throwable encryptEx = ExceptionUtility.containsExceptionContainingString(thr, "decrypt", true); //$NON-NLS-1$
+ if (encryptEx != null) {
+ showExternalFailureMessage("Password Encryption Problem", //$NON-NLS-1$
+ "Password Encryption Problem. Please ensure that connector binding " + //$NON-NLS-1$
+ "passwords were updated after the VDB was deployed from the repository.", //$NON-NLS-1$
+ encryptEx);
+ return;
}
- if( ex instanceof MetaMatrixRuntimeException) {
- Throwable t = ((MetaMatrixRuntimeException) ex).getChild();
- if (t instanceof Exception) {
- Exception nestedException = (Exception)t;
- if( nestedException instanceof MetaMatrixCoreException) {
- MetaMatrixCoreException coreException = (MetaMatrixCoreException) nestedException;
- Throwable cause = coreException.getCause();
- if( cause instanceof UnknownHostException) {
- showUnknownHostException(text, MSG_HOST_NOT_FOUND + ": Unknown host: " + cause.getMessage(), cause ); //$NON-NLS-1$
- messageDisplayed = true;
- }
-// else if (cause instanceof SSLHandshakeException) {
-// showUnknownProtocolException(text, "Protocol error : " + cause.getMessage(), nestedException ); //$NON-NLS-1$
-// messageDisplayed = true;
-// }
- }
- } else {
- showUnspecifiedFailureMessage(text, comment, t);
- }
-
- }
- if (ex instanceof ComponentNotFoundException) {
- showCompNotFoundFailureMessage(text, comment, ex);
- messageDisplayed = true;
- } else if ((ExceptionUtility.containsExceptionContainingString(ex,
- "class not compatible", true) != null) || //$NON-NLS-1$
- (ExceptionUtility.containsExceptionContainingString(ex,
- "unmarshal", true) != null)) { //$NON-NLS-1$
- showUnavailableMessage(text, ex);
- messageDisplayed = true;
- } else if (ex instanceof AuthorizationException || ex instanceof LogonException) {
- showAuthorizationFailureMessage(text, comment, ex);
- messageDisplayed = true;
- } else if (ex instanceof ExternalException) {
- Throwable licenseEx =
- ExceptionUtility.containsExceptionContainingString(ex,
- "License exception", true); //$NON-NLS-1$
- if ((licenseEx != null) && (licenseEx instanceof Exception)) {
- showExternalFailureMessage("License Error", //$NON-NLS-1$
- "License error. Please ensure that required " + //$NON-NLS-1$
- "licenses are correctly installed.", //$NON-NLS-1$
- (Exception)licenseEx);
- } else {
- Throwable t = ExceptionUtility.unRollException(ex);
- if (t instanceof ApplicationInitializationException) {
- Throwable encryptEx = ExceptionUtility.containsExceptionContainingString(t, "decrypt", true); //$NON-NLS-1$
- if (encryptEx != null) {
- showExternalFailureMessage("Password Encryption Problem", //$NON-NLS-1$
- "Password Encryption Problem. Please ensure that connector binding " + //$NON-NLS-1$
- "passwords were updated after the VDB was deployed from the repository.", //$NON-NLS-1$
- (Exception)encryptEx);
-
- } else {
- showExternalFailureMessage(text, comment, ex);
- }
- } else {
- showExternalFailureMessage(text, comment, ex);
-
- }
- }
- messageDisplayed = true;
- } else if (ex instanceof ApplicationInitializationException) {
- Throwable encryptEx = ExceptionUtility.containsExceptionContainingString(ex, "decrypt", true); //$NON-NLS-1$
- if (encryptEx != null) {
- showExternalFailureMessage("Password Encryption Problem", //$NON-NLS-1$
- "Password Encryption Problem. Please ensure that connector binding " + //$NON-NLS-1$
- "passwords were updated after the VDB was deployed from the repository.", //$NON-NLS-1$
- (Exception)encryptEx);
-
- }
-
- }
}
- if (!messageDisplayed) {
- showUnspecifiedFailureMessage(text, comment, thr);
- }
+
+ showMessage(text, comment, thr.getCause(), root);
}
public static void showMessage(String text, Throwable t) {
@@ -162,42 +144,6 @@
private static void showDialog( String text,
String cmmnt,
Throwable t,
- boolean increaseSize,
- boolean showlasterror) {
- String comment = cmmnt;
- if (comment == null) {
- comment = ""; //$NON-NLS-1$
- }
- StaticUtilities.endWait(ViewManager.getMainFrame());
- int index = comment.toLowerCase().indexOf("start server side stack trace"); //$NON-NLS-1$
- String initialDirectory = getInitialErrorDialogSaveDirectory();
- ErrorDialog.setDisplayLastException(showlasterror);
- ErrorDialog errDlg
- = new ErrorDialog( ViewManager.getMainFrame(),
- TITLE_DEFAULT,
- text,
- (index == -1) ? comment : comment.substring(0, index),
- t,
- initialDirectory);
-
- if (increaseSize) {
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int width = (int)(screenSize.width * 0.5);
- int height = (int)(screenSize.height * 0.25);
- errDlg.setSize(width, height);
- }
- errDlg.show();
- if (errDlg.isSuccessfullySaved()) {
- String fileName = errDlg.getSavedFileName().trim();
- if ((fileName != null) && (fileName.length() > 0)) {
- setInitialErrorDialogSaveDirectory(fileName);
- }
- }
- }
-
- private static void showDialog( String text,
- String cmmnt,
- Throwable t,
boolean increaseSize) {
String comment = cmmnt;
if (comment == null) {
@@ -253,45 +199,17 @@
showDialog(text, comment, t, true);
}
- public static void showQueryServiceNotAvailableFailureMessage(String text, Exception e) {
- showQueryServiceNotAvailableFailureMessage(text, "", e); //$NON-NLS-1$
- }
-
- public static void showCompNotFoundFailureMessage(String text, Exception e) {
- showCompNotFoundFailureMessage(text, "", e); //$NON-NLS-1$
- }
-
- public static void showAuthorizationFailureMessage(String text, Exception e) {
- showAuthorizationFailureMessage(text, "", e); //$NON-NLS-1$
- }
-
public static void showExternalFailureMessage(String text, Exception e) {
showExternalFailureMessage(text, "", e); //$NON-NLS-1$
}
- public static void showIllegalRequestMessage(String text, Exception e) {
- showDialog( text, MSG_ILLEGAL_REQUEST, e );
- }
-
- public static void showCannotInitializeMessage(Exception e) {
- showCannotInitializeMessage("", "", e); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
public static void showCannotInitializeMessage(String text, Exception e) {
showDialog( text, MSG_CANNOT_INITIALIZE, e );
}
- public static void showCallbackExceptionMessage(String text, Exception e) {
- showDialog( text, MSG_CALLBACK_PROBLEM, e );
- }
-
- public static void showUnspecifiedFailureMessage(String text, Throwable e) {
- showDialog( text, MSG_UNSPECIFIED_FAILURE, e );
- }
-
// 3 args:
- public static void showCompNotFoundFailureMessage(String text,
- String cmmnt, Exception e) {
+ private static void showCompNotFoundFailureMessage(String text,
+ String cmmnt, Throwable e) {
String comment = cmmnt;
if (comment == null) {
comment = ""; //$NON-NLS-1$
@@ -305,29 +223,13 @@
showDialog( text, sComment, e );
}
- public static void showQueryServiceNotAvailableFailureMessage(String text,
- String cmmnt,
- Exception e) {
+ private static void showAuthorizationFailureMessage(String text,
+ String cmmnt, Throwable e) {
String comment = cmmnt;
if (comment == null) {
comment = ""; //$NON-NLS-1$
}
String sComment = ""; //$NON-NLS-1$
- if (comment.trim().equals("")) { //$NON-NLS-1$
- sComment = MSG_QUERY_SERVICE_NOT_FOUND;
- } else {
- sComment = comment;
- }
- showDialog(text, sComment, e);
- }
-
- public static void showAuthorizationFailureMessage(String text,
- String cmmnt, Exception e) {
- String comment = cmmnt;
- if (comment == null) {
- comment = ""; //$NON-NLS-1$
- }
- String sComment = ""; //$NON-NLS-1$
if ( comment.trim().equals( "" ) ) { //$NON-NLS-1$
sComment = MSG_AUTHORIZATION_FAILURE;
} else {
@@ -336,8 +238,8 @@
showDialog( text, sComment, e );
}
- public static void showExternalFailureMessage(String text,
- String cmmnt, Exception e) {
+ private static void showExternalFailureMessage(String text,
+ String cmmnt, Throwable e) {
String comment = cmmnt;
if (comment == null) {
comment = ""; //$NON-NLS-1$
@@ -351,25 +253,7 @@
showDialog( text, sComment, e );
}
- public static void showExternalFailureMessage(String text,
- String cmmnt,
- Exception e,
- boolean showlasterror) {
- String comment = cmmnt;
- if (comment == null) {
- comment = ""; //$NON-NLS-1$
- }
- String sComment = ""; //$NON-NLS-1$
- if (comment.trim().equals("")) { //$NON-NLS-1$
- sComment = MSG_EXTERNAL_FAILURE;
- } else {
- sComment = comment;
- }
- showDialog(text, sComment, e, true, showlasterror);
- }
-
-
- public static void showUnavailableMessage(String text, Exception ex) {
+ private static void showUnavailableMessage(String text, Throwable ex) {
String comment = ConsolePlugin.Util.getString("ExceptionUtility.serverUnavailableMsg"); //$NON-NLS-1$
showDialog(text, comment, ex, true);
@@ -393,52 +277,7 @@
}
- public static void showIllegalRequestMessage(String text,
- String cmmnt, Exception e) {
- String comment = cmmnt;
- if (comment == null) {
- comment = ""; //$NON-NLS-1$
- }
- String sComment = ""; //$NON-NLS-1$
- if ( comment.trim().equals( "" ) ) { //$NON-NLS-1$
- sComment = MSG_ILLEGAL_REQUEST;
- } else {
- sComment = comment;
- }
- showDialog( text, sComment, e );
- }
-
- public static void showCannotInitializeMessage(String text,
- String cmmnt, Exception e) {
- String comment = cmmnt;
- if (comment == null) {
- comment = ""; //$NON-NLS-1$
- }
- String sComment = ""; //$NON-NLS-1$
- if ( comment.trim().equals( "" ) ) { //$NON-NLS-1$
- sComment = MSG_CANNOT_INITIALIZE;
- } else {
- sComment = comment;
- }
- showDialog( text, sComment, e );
- }
-
- public static void showCallbackExceptionMessage(String text,
- String cmmnt, Exception e) {
- String comment = cmmnt;
- if (comment == null) {
- comment = ""; //$NON-NLS-1$
- }
- String sComment = ""; //$NON-NLS-1$
- if ( comment.trim().equals( "" ) ) { //$NON-NLS-1$
- sComment = MSG_CALLBACK_PROBLEM;
- } else {
- sComment = comment;
- }
- showDialog( text, sComment, e );
- }
-
- public static void showUnspecifiedFailureMessage(String text,
+ private static void showUnspecifiedFailureMessage(String text,
String cmmnt, Throwable t) {
String comment = cmmnt;
if (comment == null) {
@@ -452,29 +291,12 @@
}
showDialog(text, sComment, t);
}
-
- public static boolean containsExceptionOfType(Throwable ex, Class cls) {
- Object obj = ex;
- boolean done = false;
- boolean found = false;
- while ((!found) && (!done)) {
- if (cls.isAssignableFrom(obj.getClass())) {
- found = true;
- } else {
- if (obj instanceof MetaMatrixException) {
- obj = ((MetaMatrixException)obj).getChild();
- if (obj == null) {
- done = true;
- }
- } else {
- done = true;
- }
- }
- }
- return found;
+
+ public static boolean containsExceptionOfType(Throwable ex, Class<? extends Throwable> cls) {
+ return ExceptionUtil.getExceptionOfType(ex, cls) != null;
}
- public static Throwable containsExceptionContainingString(Throwable ex, String searchingFor, boolean ignoreCase) {
+ private static Throwable containsExceptionContainingString(Throwable ex, String searchingFor, boolean ignoreCase) {
int searchingForLen = searchingFor.length();
Throwable result = null;
Throwable currentThrowable = ex;
@@ -564,72 +386,4 @@
}
-//
-//
-// if (theException instanceof ExternalException) {
-// ExternalException ex = (ExternalException) theException;
-//
-// if (ex.getChildren() != null) {
-// Throwable t = null;
-// while(ex.getChildren().hasNext()) {
-// // get the last exception
-// t = (Throwable) ex.getChildren().next();
-//
-// }
-//
-// if (t != null ) {
-// return unRollException(theException);
-// }
-// }
-// }
-//
-//
-//
-// Throwable cause = theException.getCause();
-// if (cause != null) {
-// return unRollException(cause);
-// }
-//
-// // Continue with any chained exceptions
-//// if (theException instanceof MetaMatrixCoreException) {
-//// MetaMatrixCoreException mmce = (MetaMatrixCoreException) theException;
-//// Throwable tc = mmce.getCause();
-//// if (tc !=null) {
-//// return unRollException(tc);
-//// }
-////
-//// tc = mmce.getStatus().getException();
-//// if (tc != null) {
-//// return unRollException(tc);
-//// }
-////
-//// Exception nested = mmce.getNestedCoreException();
-//// if (nested != null) {
-//// return unRollException(nested);
-//// }
-////
-//// } else
-// if (theException instanceof CoreException) {
-// CoreException ce = (CoreException) theException;
-// Throwable cec = ce.getCause();
-// if (cec != null) {
-// return unRollException(cec);
-// }
-//
-// cec = ce.getStatus().getException();
-// if (cec != null) {
-// return unRollException(cec);
-// }
-//
-// Throwable cet = ce.getStatus().getException();
-// if (cet != null) {
-// unRollException(cet);
-// }
-// } else if (theException.getCause() != null) {
-// return unRollException(theException.getCause());
-// }
-//
-// return theException;
- // }
-
}//end ExceptionUtility
Modified: trunk/console/src/main/java/com/metamatrix/console/util/QCDate.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/util/QCDate.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/util/QCDate.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -116,7 +116,6 @@
public static int numberOfDaysInMonth(int aYear, int aMonth) {
if ((aYear < BASE_YEAR) || (aYear > MAX_YEAR)) {
- System.err.println("Illegal year passed to QCDate.numberOfDaysInMonth()");
return -1;
}
if (aMonth == 2) {
@@ -153,7 +152,6 @@
public static int dayNumberWithinYear(int aYear, int aMonth, int aDay) {
if (!legalDate(aYear, aMonth, aDay)) {
- System.err.println("Illegal date passed to QCDate.dayNumberWithinYear()");
return -1;
}
int numDaysBeforeMonth = NUM_DAYS_BEFORE_MONTH_NON_LEAP_YEAR[aMonth - 1];
@@ -171,7 +169,6 @@
public static int dayNumber(int aYear, int aMonth, int aDay) {
//Counts starting with Jan 01, BASE_YEAR being 1, not 0.
if (!legalDate(aYear, aMonth, aDay)) {
- System.err.println("Illegal date passed to QCDate.dayNumber()");
return -1;
}
int numDaysBeforeCurYearExclFeb29 = 365 * (aYear - BASE_YEAR);
@@ -193,7 +190,6 @@
public static int weekdayNumber(int aYear, int aMonth, int aDay) {
//Counts starting with Jan 01, BASE_YEAR (which must be a Monday) being 1, not 0.
if (!legalDate(aYear, aMonth, aDay)) {
- System.err.println("illegal date passed to QCDate.weekdayNumber()");
return -1;
}
int numAllDays = dayNumber(aYear, aMonth, aDay);
@@ -208,7 +204,6 @@
public static int dayOfWeek(int aYear, int aMonth, int aDay) {
if (!legalDate(aYear, aMonth, aDay)) {
- System.err.println("Illegal date passed to QCDate.dayOfWeek()");
return -1;
}
return ((dayNumber(aYear, aMonth, aDay) - 1) % 7);
@@ -232,7 +227,6 @@
public static int weekNumber(int aYear, int aMonth, int aDay) {
//Counts starting from week of January 1, BASE_YEAR being 1, not 0.
if (!legalDate(aYear, aMonth, aDay)) {
- System.err.println("illegal date passed to QCDate.weekNumber()");
return -1;
}
int d = ((dayNumber(aYear, aMonth, aDay) - 1) / 7) + 1;
@@ -246,7 +240,6 @@
public static int monthNumber(int aYear, int aMonth) {
//Counts starting with January, BASE_YEAR being 1, not 0.
if (!legalDate(aYear, aMonth, 1)) {
- System.err.println("Illegal date passed to QCDate.monthNumber()");
return -1;
}
return ((aYear - BASE_YEAR) * 12 + aMonth);
@@ -259,7 +252,6 @@
public static int quarterNumber(int aYear, int aMonth) {
//Stipulates that quarters only begin in Jan, Apr, Jul, and Oct.
if (!legalDate(aYear, aMonth, 1)) {
- System.err.println("illegal date passed to QCDate.quarterNumber()");
return -1;
}
int qtrsBeforeCurYear = 4 * (aYear - BASE_YEAR);
@@ -284,7 +276,6 @@
int DAY_NUMBER_OF_DEC_31_1998 = dayNumber(1998, 12, 31);
if ((aDayNumber < 1) || (aDayNumber > dayNumber(MAX_YEAR, 12, 31))) {
- System.err.println("Illegal date passed to dateOfDayNumber");
return null;
}
QCDate date = new QCDate();
Modified: trunk/console/src/main/java/com/metamatrix/console/util/RuntimeExternalException.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/util/RuntimeExternalException.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/util/RuntimeExternalException.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -26,17 +26,11 @@
* Class to wrap an ExternalException within a RuntimeException.
*/
public class RuntimeExternalException extends RuntimeException {
- private Exception theException;
public RuntimeExternalException(Exception e) {
- super();
- theException = e;
+ super(e);
}
- public Exception getTheException() {
- return theException;
- }
-
public String toString() {
String str = "RuntimeExternalException: " + super.toString();
return str;
Modified: trunk/console/src/main/java/com/metamatrix/console/util/StaticTreeUtilities.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/util/StaticTreeUtilities.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/console/util/StaticTreeUtilities.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -1103,12 +1103,9 @@
if ( !LogManager.isMessageToBeRecorded( StaticTreeUtilities.CONTEXT_FOR_DUPE_CHECKING,
StaticTreeUtilities.MSGLEVEL_FOR_DUPE_CHECKING ) ) {
-// System.out.println("[userTabPaintProblemDuplicateNodeCheck] Will NOT check dupes in tree");
return;
}
-// System.out.println("[userTabPaintProblemDuplicateNodeCheck] WILL check dupes in tree");
-
java.util.List nodesList = StaticTreeUtilities.descendantsOfNode(
(javax.swing.tree.TreeNode)tree.getModel().getRoot(), true);
int listLen = nodesList.size();
Modified: trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/ComboButtonWidget.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/ComboButtonWidget.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/ComboButtonWidget.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -192,19 +192,6 @@
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
- @return The desired menu item by index
- @since Golden Gate
- */
- public JRadioButtonMenuItem getChoiceMenuItem(int index){
- if (index <= choicesMenuItemArray.length) {
- return choicesMenuItemArray[index];
- }
- System.out.println("CombButtonWidget: throw exception here");
- return null;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
@return The desired menu item by the text it was created with
@since Golden Gate
*/
Modified: trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/SeparatorWidget.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/SeparatorWidget.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/SeparatorWidget.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -164,13 +164,6 @@
public void paint(Graphics g){
Dimension s = getSize();
- /*
- System.out.println("insets: "+getInsets());
- System.out.println("size: "+getSize());
- System.out.println("horiz?: "+(getOrientation()==JSeparator.HORIZONTAL));
- System.out.println("parent: "+new Dimension(getParentWidth(), getParentHeight()));
- */
-
int firstLine;
int secondLine;
Deleted: trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/transfer/AbstractDragAndDropController.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/transfer/AbstractDragAndDropController.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/transfer/AbstractDragAndDropController.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -1,370 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership. Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-
-//################################################################################################################################
-package com.metamatrix.toolbox.ui.widget.transfer;
-
-import java.awt.Component;
-import java.awt.dnd.DnDConstants;
-import java.awt.dnd.DragGestureEvent;
-import java.awt.dnd.DragGestureListener;
-import java.awt.dnd.DragGestureRecognizer;
-import java.awt.dnd.DragSource;
-import java.awt.dnd.DragSourceDragEvent;
-import java.awt.dnd.DragSourceDropEvent;
-import java.awt.dnd.DragSourceEvent;
-import java.awt.dnd.DragSourceListener;
-import java.awt.dnd.DropTarget;
-import java.awt.dnd.DropTargetDragEvent;
-import java.awt.dnd.DropTargetDropEvent;
-import java.awt.dnd.DropTargetEvent;
-import java.awt.dnd.DropTargetListener;
-import java.util.Iterator;
-
-/**
- at since 2.1
- at version 2.1
- at author <a href="mailto:jverhaeg at metamatrix.com">John P. A. Verhaeg</a>
-*/
-public abstract class AbstractDragAndDropController
-implements DragAndDropController, DragGestureListener, DragSourceListener, DropTargetListener {
- //############################################################################################################################
- //# Static Variables #
- //############################################################################################################################
-
- private static final int DRAG_THRESHOLD = 3;
- private static transient Object dragSrc, dropTarget;
- private static transient boolean dragging;
- private static transient int actDropAction;
-
- private static boolean debug;
-
- //############################################################################################################################
- //# Instance Variables #
- //############################################################################################################################
-
- private Component comp;
- private int allowedDragActions, allowedDropActions;
- private DragGestureRecognizer dragGestureRecognizer;
- private DropTarget dropTargetMgr;
-
- //############################################################################################################################
- //# Constructors #
- //############################################################################################################################
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- * @since 2.1
- */
- protected AbstractDragAndDropController() {
- constructAbstractDragAndDropController();
- }
-
- //############################################################################################################################
- //# Instance Methods #
- //############################################################################################################################
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- * @since 2.1
- */
- protected void constructAbstractDragAndDropController() {
- dragGestureRecognizer
- = DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(null, DnDConstants.ACTION_NONE, this);
- dropTargetMgr = new DropTarget(null, DnDConstants.ACTION_NONE, this);
- setAllowedDragActions(getDefaultAllowedDragActions());
- setAllowedDropActions(getDefaultAllowedDropActions());
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- protected void debug(final String message) {
- if (!debug) {
- return;
- }
- final String name = getClass().getName();
- System.out.println(name.substring(name.lastIndexOf('.') + 1) + ": " + message);
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- Sets drag-in-progress indicator to false.
- @param event Not used
- @since 2.1
- */
- public void dragDropEnd(final DragSourceDropEvent event) {
- debug("dragDropEnd (No impl)");
- dragging = false;
- dragSrc = dropTarget = null;
- comp.repaint();
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- Does nothing.
- @since 2.1
- */
- public void dragEnter(final DragSourceDragEvent event) {
- debug("dragEnter(source) (No impl)");
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- * Implemented to determine the actual drop action applicable to the drop target (assuming the drag source is valid).
- * @since 2.1
- */
- public void dragEnter(final DropTargetDragEvent event) {
- debug("dragEnter(target)");
- actDropAction = event.getDropAction();
- final int allowedActions = getAllowedDropActions();
- if ((actDropAction & allowedActions) == 0) {
- if ((allowedActions & DnDConstants.ACTION_MOVE) != 0) {
- actDropAction = DnDConstants.ACTION_MOVE;
- } else {
- actDropAction = DnDConstants.ACTION_COPY;
- }
- }
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- Does nothing.
- @since 2.1
- */
- public void dragExit(final DragSourceEvent event) {
- debug("dragEnter(source) (No impl)");
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- Does nothing.
- @since 2.1
- */
- public void dragExit(final DropTargetEvent event) {
- debug("dragEnter(target)");
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- Sets drag-in-progress indicator to true.
- @param event Not used
- @since 2.1
- */
- public void dragGestureRecognized(final DragGestureEvent event) {
- debug("dragGestureRecognized");
- // my attempt to reduce the sensitivity of the drag gesture
- int count = 0;
- for ( Iterator i = event.iterator() ; count < DRAG_THRESHOLD && i.hasNext() ; i.next() ) {
- ++count;
- }
- dragging = ( count >= DRAG_THRESHOLD );
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- Does nothing.
- @since 2.1
- */
- public void dragOver(final DragSourceDragEvent event) {
- debug("dragOver(source) (No impl)");
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- Does nothing.
- @since 2.1
- */
- public void dragOver(final DropTargetDragEvent event) {
- debug("dragOver(target) (No impl)");
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- Does nothing.
- @since 2.1
- */
- public void drop(final DropTargetDropEvent event) {
- debug("drop (No impl)");
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- Does nothing.
- @since 2.1
- */
- public void dropActionChanged(final DragSourceDragEvent event) {
- debug("dropActionChanged(source) (No impl)");
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- Does nothing.
- @since 2.1
- */
- public void dropActionChanged(final DropTargetDragEvent event) {
- debug("dropActionChanged(target) (No impl)");
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- * @since 2.1
- */
- protected int getActualDropAction() {
- return actDropAction;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- * Gets the allowed drag actions.
- * @return The allowed drag actions
- * @see DnDConstants#ACTION_COPY
- * @see DnDConstants#ACTION_MOVE
- * @see DnDConstants#ACTION_COPY_OR_MOVE
- * @since 2.1
- */
- public int getAllowedDragActions() {
- return allowedDragActions;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- * Gets the allowed drop actions.
- * @return The allowed drop actions
- * @see DnDConstants#ACTION_COPY
- * @see DnDConstants#ACTION_MOVE
- * @see DnDConstants#ACTION_COPY_OR_MOVE
- * @since 2.1
- */
- public int getAllowedDropActions() {
- return allowedDropActions;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- public Component getComponent() {
- return comp;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- * Gets the default allowed drag actions.
- * @since 2.1
- */
- protected int getDefaultAllowedDragActions() {
- return DnDConstants.ACTION_COPY_OR_MOVE;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- * Gets the default allowed drop actions.
- * @since 2.1
- */
- protected int getDefaultAllowedDropActions() {
- return DnDConstants.ACTION_COPY_OR_MOVE;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- public Object getDragSource() {
- return dragSrc;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- public Object getDropTarget() {
- return dropTarget;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- Returns whether a drag is in progress.
- @return True if a drag is in progress
- @since 2.1
- */
- public boolean isDragging() {
- return dragging;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- * Sets the allowed drag actions.
- * @param actions The allowed drag actions
- * @see DnDConstants#ACTION_COPY
- * @see DnDConstants#ACTION_MOVE
- * @see DnDConstants#ACTION_COPY_OR_MOVE
- * @since 2.1
- */
- public void setAllowedDragActions(int actions) {
- allowedDragActions = actions;
- dragGestureRecognizer.setSourceActions(actions);
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- * Sets the allowed drop actions.
- * @param actions The allowed drop actions
- * @see DnDConstants#ACTION_COPY
- * @see DnDConstants#ACTION_MOVE
- * @see DnDConstants#ACTION_COPY_OR_MOVE
- * @since 2.1
- */
- public void setAllowedDropActions(int actions) {
- allowedDropActions = actions;
- dropTargetMgr.setDefaultActions(actions);
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- Sets the Component upon which drag and drop operations can occur.
- @param component An instance of Component
- @since 2.1
- */
- public void setComponent(Component component) {
- comp = component;
- dragGestureRecognizer.setComponent(component);
- dropTargetMgr.setComponent(component);
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- public void setDragSource(final Object source) {
- dragSrc = source;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- public void setDropTarget(final Object target) {
- dropTarget = target;
- }
-}
Deleted: trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/transfer/AbstractTreeNodeDragAndDropController.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/transfer/AbstractTreeNodeDragAndDropController.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/transfer/AbstractTreeNodeDragAndDropController.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -1,667 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership. Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-
-//################################################################################################################################
-package com.metamatrix.toolbox.ui.widget.transfer;
-
-// JDK imports
-import java.awt.datatransfer.DataFlavor;
-import java.awt.dnd.DnDConstants;
-import java.awt.dnd.DragGestureEvent;
-import java.awt.dnd.DragSource;
-import java.awt.dnd.DragSourceDragEvent;
-import java.awt.dnd.DragSourceDropEvent;
-import java.awt.dnd.DragSourceEvent;
-import java.awt.dnd.DropTargetDragEvent;
-import java.awt.dnd.DropTargetDropEvent;
-import java.awt.dnd.DropTargetEvent;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import com.metamatrix.common.transaction.TransactionException;
-import com.metamatrix.common.transaction.UserTransaction;
-import com.metamatrix.common.tree.TreeNode;
-import com.metamatrix.common.tree.TreeNodeEditor;
-import com.metamatrix.common.tree.TreeView;
-import com.metamatrix.core.util.Assertion;
-
-/**
- at since 2.1
- at version 2.1
- at author <a href="mailto:jverhaeg at metamatrix.com">John P. A. Verhaeg</a>
-*/
-public abstract class AbstractTreeNodeDragAndDropController extends AbstractDragAndDropController
-implements TreeNodeDragAndDropController {
- //############################################################################################################################
- //# Static Variables #
- //############################################################################################################################
-
- protected static transient TreeNode dragParent, dropParent;
- protected static transient int dropNdx, dragNdx;
- protected static transient TransferableTreeNode xferable;
- protected static transient boolean validDragSrc, validDropTarget;
-
- //############################################################################################################################
- //# Static Methods #
- //############################################################################################################################
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- public static int getDragIndex() {
- return dragNdx;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- public static TreeNode getDragParent() {
- return dragParent;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- public static int getDropIndex() {
- return dropNdx;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- public static TreeNode getDropParent() {
- return dropParent;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- protected static TransferableTreeNode getTransferable() {
- return xferable;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- protected static boolean isValidDragSource() {
- return validDragSrc;
- }
-
- //############################################################################################################################
- //# Instance Variables #
- //############################################################################################################################
-
- protected boolean allowsDropsWithinNodes, allowsDropsBetweenNodes;
- protected TreeView view;
- protected transient boolean dragSrc, dropTarget;
- protected boolean willDropAboveTarget, willDropBelowTarget, willDropOnTarget;
-
- //############################################################################################################################
- //# Constructors #
- //############################################################################################################################
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- * @since 2.1
- */
- protected AbstractTreeNodeDragAndDropController(final boolean allowsDropsWithinNodes, final boolean allowsDropsBetweenNodes) {
- constructAbstractTreeNodeDragAndDropController(allowsDropsWithinNodes, allowsDropsBetweenNodes);
- }
-
- //############################################################################################################################
- //# Instance Methods #
- //############################################################################################################################
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- * @since 2.1
- */
- protected boolean addNode() {
- debug("addNode");
- if (getActualDropAction() == DnDConstants.ACTION_MOVE) {
- return transferNode();
- }
- return false;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- public boolean allowsDropsBetweenNodes() {
- return allowsDropsBetweenNodes;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- public boolean allowsDropsWithinNodes() {
- return allowsDropsWithinNodes;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- * @since 2.1
- */
- protected void constructAbstractTreeNodeDragAndDropController(final boolean allowsDropsWithinNodes,
- final boolean allowsDropsBetweenNodes) {
- this.allowsDropsWithinNodes = allowsDropsWithinNodes;
- this.allowsDropsBetweenNodes = allowsDropsBetweenNodes;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- public void dragDropEnd(final DragSourceDropEvent event) {
- debug("dragDropEnd");
- dragParent = dropParent = null;
- validDragSrc = validDropTarget = false;
- dragSrc = dropTarget = false;
- super.dragDropEnd(event);
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- * Accepts TreeNode move & copy operations.
- * @since 2.1
- */
- public void dragEnter(final DropTargetDragEvent event) {
- debug("dragEnter(target)");
- super.dragEnter(event);
- validDragSrc = getValidDragSource(event.getCurrentDataFlavors());
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- public void dragExit(final DragSourceEvent event) {
- debug("dragExit(source)");
- event.getDragSourceContext().setCursor(DragSource.DefaultMoveNoDrop); // Assuming move and copy cursor are identical
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- public void dragExit(final DropTargetEvent event) {
- debug("dragExit(target)");
- super.dragExit(event);
- validDropTarget = false;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- Sets the cursor to reflect whether the node under the mouse is a legal drop target.
- @since 2.1
- */
- public void dragOver(final DragSourceDragEvent event) {
- debug("dragOver(source)");
- // Set cursor to reflect whether drop target is legal
- final int action = getActualDropAction();
- if (validDropTarget) {
- if (action == DnDConstants.ACTION_COPY) {
- event.getDragSourceContext().setCursor(DragSource.DefaultCopyDrop);
- } else {
- event.getDragSourceContext().setCursor(DragSource.DefaultMoveDrop);
- }
- } else {
- if (action == DnDConstants.ACTION_COPY) {
- event.getDragSourceContext().setCursor(DragSource.DefaultCopyNoDrop);
- } else {
- event.getDragSourceContext().setCursor(DragSource.DefaultMoveNoDrop);
- }
- }
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- Resets the will-drop-xxx-target and is-valid-drop-target indicators to false, resets the drop target to null.
- @param event Not used
- @since 2.0
- */
- public void dragOver(final DropTargetDragEvent event) {
- debug("dragOver(target)");
- willDropAboveTarget = willDropBelowTarget = willDropOnTarget = false;
- setDropTarget(null);
- validDropTarget = false;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- * Moves or copies the dragged node to the drop location determined in the dragOver(DropTargetDragEvent) method.
- * @since 2.1
- */
- public void drop(final DropTargetDropEvent event) {
- debug("drop");
- dropTarget = true;
- if (getDropTarget() != null) {
- if (dragSrc) {
- if (moveNode()) {
- debug("drop moveNode()");
- event.acceptDrop(event.getDropAction());
- } else {
- debug("drop moveNode() rejectDrop()");
- event.rejectDrop();
- }
- } else if (addNode()) {
- debug("drop addNode()");
- event.acceptDrop(event.getDropAction());
- } else {
- debug("drop addNode() rejectDrop()");
- event.rejectDrop();
- }
- } else {
- event.rejectDrop();
- }
- event.getDropTargetContext().dropComplete(true);
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- * Gets the default allowed drag actions.
- * @since 2.1
- */
- protected int getDefaultAllowedDragActions() {
- return DnDConstants.ACTION_MOVE;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- * Gets the default allowed drop actions.
- * @since 2.1
- */
- protected int getDefaultAllowedDropActions() {
- return DnDConstants.ACTION_MOVE;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- protected TreeView getTreeView() {
- return view;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- * @since 2.1
- */
- protected boolean getValidDragSource(final DataFlavor[] flavors) {
- DataFlavor flavor;
- for (int ndx = flavors.length; --ndx >= 0;) {
- flavor = flavors[ndx];
- if (isTreeNodeFlavor(flavor)) {
- return true;
- }
- }
- return false;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- * Retrieves whether the current component beneath the cursor is a valid drop target.
- * @return True if the drop target is valid
- * @since 2.1
- */
- protected boolean getValidDropTarget() {
- return validDropTarget;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- protected boolean isDragSource() {
- return dragSrc;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- protected boolean isDropTarget() {
- return dropTarget;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- protected boolean isTreeNodeFlavor(final DataFlavor flavor) {
- for (int ndx = TransferableTreeNode.FLAVORS.length; --ndx >= 0;) {
- if (flavor.equals(TransferableTreeNode.FLAVORS[ndx])) {
- return true;
- }
- }
- return false;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- protected boolean moveNode() {
- debug("moveNode");
- return transferNode();
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- public void setAllowsDropsBetweenNodes(final boolean allowsDropsBetweenNodes) {
- debug("setAllowsDropsBetweenNodes: " + allowsDropsBetweenNodes);
- this.allowsDropsBetweenNodes = allowsDropsBetweenNodes;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- public void setAllowsDropsWithinNodes(final boolean allowsDropsWithinNodes) {
- debug("setAllowsDropsWithinNodes: " + allowsDropsWithinNodes);
- this.allowsDropsWithinNodes = allowsDropsWithinNodes;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- protected void setDropNode(final TreeNode dropNode, final boolean betweenNodes) {
- final TreeNode dragNode = (TreeNode)getDragSource();
- // Drop if:
- // - Drops within nodes are allowed
- // - The drop node allows children
- // - The drop node allows the drag node as a child
- // - The drop node is not equal to the drag node, the drag node's parent, or any of the drag node's descendents
- // - The drop node is not read-only
- if (!betweenNodes
- && allowsDropsWithinNodes
- && view.allowsChildren(dropNode)
- && view.allowsChild(dropNode, dragNode)
- && dropNode != dragNode
- && dropNode != view.getParent(dragNode)
- && !view.isAncestorOf(dragNode, dropNode)
- && !view.getTreeNodeEditor().isReadOnly(dropNode)
- ) {
-
- setDropTarget(dropNode);
- dropParent = dropNode;
- final List children = view.getChildren(dropNode);
- if (children == null) {
- dropNdx = 0;
- } else {
- dropNdx = children.size();
- }
- validDropTarget = true;
- return;
- }
- // Drop if:
- // - Drops between nodes are allowed
- // - The drop node's parent allows the drag node as a child
- // - The drop node's parent is not equal to the drag node or any of the drag node's descendents
- // - The drop node's parent is not read-only
- // - The drop node is not equal to the drag node
- // - The drop will occur below the drop node or the drop node is not equal to the drag node's next sibling (child of drag
- // node's parent at drag index + 1)
- // - The drop will occur above the drop node or the drop node is not equal to the drag node's previous sibling (child of
- // drag node's parent at drag index - 1)
- if (betweenNodes && allowsDropsBetweenNodes) {
- final TreeNode parent = view.getParent(dropNode);
- if (parent != null && view.allowsChild(parent, dragNode) && parent != dragNode
- && !view.isAncestorOf(dragNode, parent) && !view.getTreeNodeEditor().isReadOnly(parent)
- && dropNode != dragNode) {
-
- final List children = view.getChildren(parent);
- if (parent != view.getParent(dragNode)
- || ((willDropBelowTarget || children.indexOf(dropNode) != children.indexOf(dragNode) + 1)
- && (willDropAboveTarget || children.indexOf(dropNode) != children.indexOf(dragNode) - 1))) {
- setDropTarget(dropNode);
- dropParent = parent;
- dropNdx = view.getChildren(parent).indexOf(dropNode);
- if (willDropBelowTarget) {
- ++dropNdx;
- }
- validDropTarget = true;
- return;
- }
- }
- }
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- protected void setTreeView(final TreeView view) {
- this.view = view;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- Sets whether a drop at the current mouse position will occur above the current drop target.
- @param aboveTarget True if the drop will occur above the current drop target.
- @since 2.1
- */
- public void setWillDropAboveTarget(final boolean aboveTarget) {
- willDropAboveTarget = aboveTarget;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- Sets whether a drop at the current mouse position will occur below the current drop target.
- @param belowTarget True if the drop will occur below the current drop target.
- @since 2.1
- */
- public void setWillDropBelowTarget(final boolean belowTarget) {
- willDropBelowTarget = belowTarget;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- Sets whether a drop at the current mouse position will occur on the current drop target.
- @param onTarget True if the drop will occur on the current drop target.
- @since 2.1
- */
- public void setWillDropOnTarget(final boolean onTarget) {
- willDropOnTarget = onTarget;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- * Sets whether the current component beneath the cursor is a valid drop target.
- * @param valid True if the drop target is valid
- * @since 2.1
- */
- protected void setValidDropTarget(final boolean valid) {
- validDropTarget = valid;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- Begins drag operations, saving reference to node being dragged.
- @since 2.1
- */
- protected void startDrag(final DragGestureEvent event, final TreeNode dragNode) {
- debug("startDrag TreeNode: " + dragNode);
- Assertion.isNotNull(view, "The setTreeView(TreeView) method must first be called with an instance of " + TreeView.class);
-
- ArrayList listOfOne = new ArrayList();
- listOfOne.add(dragNode);
-
- if (isDragCandidate(listOfOne)){
- dragSrc = true;
- setDragSource(dragNode);
- xferable = new TransferableTreeNode(listOfOne);
- dragParent = view.getParent(dragNode);
- dragNdx = view.getChildren(dragParent).indexOf(dragNode);
- debug("startDrag: dragParent=" + dragParent + ", dragNdx=" + dragNdx);
- if (event.getDragAction() == DnDConstants.ACTION_COPY) {
- DragSource.getDefaultDragSource().startDrag(event, DragSource.DefaultCopyDrop, xferable, this);
- } else {
- DragSource.getDefaultDragSource().startDrag(event, DragSource.DefaultMoveDrop, xferable, this);
- }
- super.dragGestureRecognized(event);
- }
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- Begins drag operations, saving reference to node being dragged.
- @since 2.1
- */
-// protected void startDrag(final DragGestureEvent event, final TreeNode dragNode) {
- protected void startDrag(final DragGestureEvent event, final List dragNode) {
- debug("startDrag List: " + dragNode);
- Assertion.isNotNull(view, "The setTreeView(TreeView) method must first be called with an instance of " + TreeView.class);
-
- if (isDragCandidate(dragNode)){
- dragSrc = true;
- setDragSource(dragNode);
- xferable = new TransferableTreeNode(dragNode);
- dragParent = view.getParent((TreeNode)dragNode.get(0));
- dragNdx = view.getChildren(dragParent).indexOf(dragNode);
- debug("startDrag: dragParent=" + dragParent + ", dragNdx=" + dragNdx);
- if (event.getDragAction() == DnDConstants.ACTION_COPY) {
- DragSource.getDefaultDragSource().startDrag(event, DragSource.DefaultCopyDrop, xferable, this);
- } else {
- DragSource.getDefaultDragSource().startDrag(event, DragSource.DefaultMoveDrop, xferable, this);
- }
- super.dragGestureRecognized(event);
- }
- }
-
-// protected boolean isDragCandidate(TreeNode dragNode) {
- protected boolean isDragCandidate(List dragNode) {
-// return (dragNode != null && !view.getTreeNodeEditor().isReadOnly(view.getParent(dragNode)));
- final TreeNode parent = view.getParent((TreeNode)dragNode.get(0));
- return (dragNode != null && parent != null && !view.getTreeNodeEditor().isReadOnly(parent));
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- @since 2.1
- */
- protected boolean transferNode() {
- debug("transferNode");
- final TreeNodeEditor editor = view.getTreeNodeEditor();
- boolean allSuccessful = false;
-
- if ( getDragSource() instanceof TreeNode ) {
-
- final UserTransaction xaction = editor.createWriteTransaction(this);
- boolean wasErr = true;
- try {
- xaction.begin();
- allSuccessful = editor.move((TreeNode)getDragSource(), dropParent, dropNdx);
- xaction.commit();
- wasErr = false;
- } catch (final TransactionException err) {
- throw new RuntimeException(err.getMessage());
- } finally {
- try {
- if (wasErr) {
- xaction.rollback();
- }
- } catch (final TransactionException err) {
- throw new RuntimeException(err.getMessage());
- }
- }
-
- } else if ( getDragSource() instanceof List ) {
-
- Iterator dragListIter = ((List)getDragSource()).iterator();
-
- while (dragListIter.hasNext()) {
- TreeNode node = (TreeNode) dragListIter.next();
-
- final UserTransaction xaction = editor.createWriteTransaction(this);
- allSuccessful = true;
- boolean wasSuccessful = false;
- boolean wasErr = true;
- try {
- xaction.begin();
- wasSuccessful = editor.move(node, dropParent, dropNdx++);
- if(!wasSuccessful) {
- allSuccessful = false;
- }
- xaction.commit();
- wasErr = false;
- } catch (final TransactionException err) {
- throw new RuntimeException(err.getMessage());
- } finally {
- try {
- if (wasErr) {
- xaction.rollback();
- }
- } catch (final TransactionException err) {
- throw new RuntimeException(err.getMessage());
- }
- }
-
-
- }
- }
-
- return allSuccessful;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- Returns whether a drop at the current mouse position will occur above the current drop target.
- @return True if the drop will occur above the current drop target.
- @since 2.1
- */
- public boolean willDropAboveTarget() {
- return willDropAboveTarget;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- Returns whether a drop at the current mouse position will occur below the current drop target.
- @return True if the drop will occur below the current drop target.
- @since 2.1
- */
- public boolean willDropBelowTarget() {
- return willDropBelowTarget;
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- /**
- Returns whether a drop at the current mouse position will occur on the current drop target.
- @return True if the drop will occur on the current drop target.
- @since 2.1
- */
- public boolean willDropOnTarget() {
- return willDropOnTarget;
- }
-}
Modified: trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/util/BrowserControl.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/util/BrowserControl.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/util/BrowserControl.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -24,6 +24,8 @@
import java.io.IOException;
+import com.metamatrix.console.util.ExceptionUtility;
+
/**
* BrowserControl is a static class that enables code to invoke the default web browser
* on the user's machine, either Windows or Unix.
@@ -92,15 +94,11 @@
}
}
catch(InterruptedException x) {
- System.err.println("Error bringing up browser, cmd='" + cmd + "'");
- System.err.println("Caught: " + x);
}
}
}
catch(IOException x) {
- // couldn't exec browser
- System.err.println("Could not invoke browser, command=" + cmd);
- System.err.println("Caught: " + x);
+ ExceptionUtility.showMessage("Could not invoke browser, command=" + cmd, x);
}
}
Modified: trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/util/PropertyLoader.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/util/PropertyLoader.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/util/PropertyLoader.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -143,35 +143,4 @@
}
- // unit test
- public static void main(String[] args) {
- try {
-
- Properties testProps = new Properties();
- testProps.setProperty("TestA.A.A", "TestA.A.A value");
- testProps.setProperty("TestA.B.A", "TestA.B.A value");
- testProps.setProperty("TestA.C.A", "TestA.C.A value");
- testProps.setProperty("TestA.D.A", "TestA.D.A value");
- testProps.setProperty("TestA.E.A", "TestA.E.A value");
- testProps.setProperty("TestB.A.A", "TestB.A.A value");
- testProps.setProperty("TestB.B.A", "TestB.B.A value");
- testProps.setProperty("TestB.C.A", "TestB.C.A value");
- testProps.setProperty("TestB.D.A", "TestB.D.A value");
- testProps.setProperty("TestB.E.A", "TestB.E.A value");
-
- PropertyLoader loader = new PropertyLoader(testProps);
- Properties p = loader.getPropertiesBranch("TestB.");
-
- Iterator iter = p.keySet().iterator();
- while(iter.hasNext()) {
- String key = (String)iter.next();
- String val = (String)p.get(key);
- System.out.print(key + " = " + val + "\n");
- }
-
- } catch (PropertyLoaderException e) {
- e.printStackTrace();
- }
- }
-
}
Modified: trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/util/StringFilter.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/util/StringFilter.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/util/StringFilter.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -127,162 +127,4 @@
}
- // unit test
- public static void main(String[] args) {
-
- StringFilter filter = new StringFilter("*");
- System.out.print("\nFilter = \"" + filter.toString() + "\"\n");
- System.out.print("Filter is wildcard = " + filter.isWildcard() + "\n" );
- StringFilter.testFilter(true,filter,"A string");
- StringFilter.testFilter(true,filter,"*");
- StringFilter.testFilter(true,filter,"");
- StringFilter.testFilter(true,filter,null);
-
- System.out.print("\n");
-
- filter = new StringFilter("ABCD");
- System.out.print("\nFilter = \"" + filter.toString() + "\"\n");
- System.out.print("Filter is wildcard = " + filter.isWildcard() + "\n" );
- StringFilter.testFilter(false,filter,"A string");
- StringFilter.testFilter(true,filter,"ABCD");
- StringFilter.testFilter(false,filter,"ABC");
- StringFilter.testFilter(false,filter,"ABCDE");
- StringFilter.testFilter(false,filter,"vABCD");
- StringFilter.testFilter(false,filter,"vABC");
- StringFilter.testFilter(false,filter,"vABCDE");
- StringFilter.testFilter(false,filter,"abcd");
- StringFilter.testFilter(false,filter,"abc");
- StringFilter.testFilter(false,filter,"abcde");
- StringFilter.testFilter(false,filter,"vabcd");
- StringFilter.testFilter(false,filter,"vabc");
- StringFilter.testFilter(false,filter,"vabcde");
- StringFilter.testFilter(false,filter,"aBcd");
- StringFilter.testFilter(false,filter,"aBc");
- StringFilter.testFilter(false,filter,"aBcde");
-
- filter = new StringFilter("abcd");
- System.out.print("\nFilter = \"" + filter.toString() + "\"\n");
- System.out.print("Filter is wildcard = " + filter.isWildcard() + "\n" );
- StringFilter.testFilter(false,filter,"A string");
- StringFilter.testFilter(false,filter,"ABCD");
- StringFilter.testFilter(false,filter,"ABC");
- StringFilter.testFilter(false,filter,"ABCDE");
- StringFilter.testFilter(false,filter,"vABCD");
- StringFilter.testFilter(false,filter,"vABC");
- StringFilter.testFilter(false,filter,"vABCDE");
- StringFilter.testFilter(true,filter,"abcd");
- StringFilter.testFilter(false,filter,"abc");
- StringFilter.testFilter(false,filter,"abcde");
- StringFilter.testFilter(false,filter,"vabcd");
- StringFilter.testFilter(false,filter,"vabc");
- StringFilter.testFilter(false,filter,"vabcde");
- StringFilter.testFilter(false,filter,"aBcd");
- StringFilter.testFilter(false,filter,"aBc");
- StringFilter.testFilter(false,filter,"aBcde");
-
- filter = new StringFilter("abcd*");
- System.out.print("\nFilter = \"" + filter.toString() + "\"\n");
- System.out.print("Filter is wildcard = " + filter.isWildcard() + "\n" );
- StringFilter.testFilter(false,filter,"A string");
- StringFilter.testFilter(false,filter,"ABCD");
- StringFilter.testFilter(false,filter,"ABC");
- StringFilter.testFilter(false,filter,"ABCDE");
- StringFilter.testFilter(false,filter,"vABCD");
- StringFilter.testFilter(false,filter,"vABC");
- StringFilter.testFilter(false,filter,"vABCDE");
- StringFilter.testFilter(true,filter,"abcd");
- StringFilter.testFilter(false,filter,"abc");
- StringFilter.testFilter(true,filter,"abcde");
- StringFilter.testFilter(false,filter,"vabcd");
- StringFilter.testFilter(false,filter,"vabc");
- StringFilter.testFilter(false,filter,"vabcde");
- StringFilter.testFilter(false,filter,"aBcd");
- StringFilter.testFilter(false,filter,"aBc");
- StringFilter.testFilter(false,filter,"aBcde");
-
- filter = new StringFilter("*abcd*");
- System.out.print("\nFilter = \"" + filter.toString() + "\"\n");
- System.out.print("Filter is wildcard = " + filter.isWildcard() + "\n" );
- StringFilter.testFilter(false,filter,"A string");
- StringFilter.testFilter(false,filter,"ABCD");
- StringFilter.testFilter(false,filter,"ABC");
- StringFilter.testFilter(false,filter,"ABCDE");
- StringFilter.testFilter(false,filter,"vABCD");
- StringFilter.testFilter(false,filter,"vABC");
- StringFilter.testFilter(false,filter,"vABCDE");
- StringFilter.testFilter(true,filter,"abcd");
- StringFilter.testFilter(false,filter,"abc");
- StringFilter.testFilter(true,filter,"abcde");
- StringFilter.testFilter(true,filter,"vabcd");
- StringFilter.testFilter(false,filter,"vabc");
- StringFilter.testFilter(true,filter,"vabcde");
- StringFilter.testFilter(false,filter,"aBcd");
- StringFilter.testFilter(false,filter,"aBc");
- StringFilter.testFilter(false,filter,"aBcde");
-
- filter = new StringFilter("*abcd*efg*");
- System.out.print("\nFilter = \"" + filter.toString() + "\"\n");
- System.out.print("Filter is wildcard = " + filter.isWildcard() + "\n" );
- StringFilter.testFilter(false,filter,"A string");
- StringFilter.testFilter(false,filter,"ABCDEFG");
- StringFilter.testFilter(false,filter,"ABC");
- StringFilter.testFilter(false,filter,"ABCDEFGH");
- StringFilter.testFilter(false,filter,"vABCDEFG");
- StringFilter.testFilter(false,filter,"vABC");
- StringFilter.testFilter(false,filter,"vABCDEFG");
- StringFilter.testFilter(true,filter,"abcdxefgh");
- StringFilter.testFilter(true,filter,"abcdefgh");
- StringFilter.testFilter(false,filter,"abc");
- StringFilter.testFilter(true,filter,"abcdefghx");
- StringFilter.testFilter(true,filter,"vabcdefgh");
- StringFilter.testFilter(false,filter,"vabc");
- StringFilter.testFilter(true,filter,"vabcdefghx");
- StringFilter.testFilter(true,filter,"vabcdeefghx");
-
- filter = new StringFilter("*abcd*defg*");
- System.out.print("\nFilter = \"" + filter.toString() + "\"\n");
- System.out.print("Filter is wildcard = " + filter.isWildcard() + "\n" );
- StringFilter.testFilter(true,filter,"abcdxdefg");
- StringFilter.testFilter(true,filter,"abcddefg");
- StringFilter.testFilter(true,filter,"abcdxdefgx");
- StringFilter.testFilter(false,filter,"abcdefgh");
- StringFilter.testFilter(true,filter,"vabcddefgx");
- StringFilter.testFilter(true,filter,"vabcdxdefgx");
- StringFilter.testFilter(false,filter,"vabc");
- StringFilter.testFilter(false,filter,"aBcdxdefg");
-
- filter = new StringFilter("*abcd*defg*",false);
- System.out.print("\nFilter = \"" + filter.toString() + "\"\n");
- System.out.print("Filter is wildcard = " + filter.isWildcard() + "\n" );
- StringFilter.testFilter(true,filter,"abcdxdefg");
- StringFilter.testFilter(true,filter,"abcddefg");
- StringFilter.testFilter(true,filter,"abcdxdefgx");
- StringFilter.testFilter(false,filter,"abcdefgh");
- StringFilter.testFilter(true,filter,"vabcddefgx");
- StringFilter.testFilter(true,filter,"vabcdxdefgx");
- StringFilter.testFilter(false,filter,"vabc");
- StringFilter.testFilter(false,filter,"aBcdxdefg");
-
-
- filter = new StringFilter("*abcd*defg*",true);
- System.out.print("\nFilter = \"" + filter.toString() + "\" (ignores case)\n");
- System.out.print("Filter is wildcard = " + filter.isWildcard() + "\n" );
- StringFilter.testFilter(true,filter,"abcdxdefg");
- StringFilter.testFilter(true,filter,"abcddefg");
- StringFilter.testFilter(true,filter,"abcdxdefgx");
- StringFilter.testFilter(false,filter,"abcdefgh");
- StringFilter.testFilter(true,filter,"vabcddefgx");
- StringFilter.testFilter(true,filter,"vabcdxdefgx");
- StringFilter.testFilter(false,filter,"vabc");
- StringFilter.testFilter(true,filter,"aBcdxdefg");
-
- }
-
- private static void testFilter( boolean correctResult, StringFilter filter, String str ) {
- boolean result = filter.includes(str);
- if ( correctResult != result ) {
- System.out.print("Result for includes(\"" + str + "\") is INCORRECT (was " + result + ")\n");
- }
- }
-
}
Added: trunk/console/src/test/java/com/metamatrix/toolbox/ui/widget/util/TestStringFilter.java
===================================================================
--- trunk/console/src/test/java/com/metamatrix/toolbox/ui/widget/util/TestStringFilter.java (rev 0)
+++ trunk/console/src/test/java/com/metamatrix/toolbox/ui/widget/util/TestStringFilter.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -0,0 +1,166 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
+package com.metamatrix.toolbox.ui.widget.util;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestStringFilter {
+
+ // unit test
+ @Test public void testStringFilter() {
+
+ StringFilter filter = new StringFilter("*"); //$NON-NLS-1$
+ testFilter(true,filter,"A string"); //$NON-NLS-1$
+ testFilter(true,filter,"*"); //$NON-NLS-1$
+ testFilter(true,filter,""); //$NON-NLS-1$
+ testFilter(true,filter,null);
+
+ filter = new StringFilter("ABCD"); //$NON-NLS-1$
+ testFilter(false,filter,"A string"); //$NON-NLS-1$
+ testFilter(true,filter,"ABCD"); //$NON-NLS-1$
+ testFilter(false,filter,"ABC"); //$NON-NLS-1$
+ testFilter(false,filter,"ABCDE"); //$NON-NLS-1$
+ testFilter(false,filter,"vABCD"); //$NON-NLS-1$
+ testFilter(false,filter,"vABC"); //$NON-NLS-1$
+ testFilter(false,filter,"vABCDE"); //$NON-NLS-1$
+ testFilter(false,filter,"abcd"); //$NON-NLS-1$
+ testFilter(false,filter,"abc"); //$NON-NLS-1$
+ testFilter(false,filter,"abcde"); //$NON-NLS-1$
+ testFilter(false,filter,"vabcd"); //$NON-NLS-1$
+ testFilter(false,filter,"vabc"); //$NON-NLS-1$
+ testFilter(false,filter,"vabcde"); //$NON-NLS-1$
+ testFilter(false,filter,"aBcd"); //$NON-NLS-1$
+ testFilter(false,filter,"aBc"); //$NON-NLS-1$
+ testFilter(false,filter,"aBcde"); //$NON-NLS-1$
+
+ filter = new StringFilter("abcd"); //$NON-NLS-1$
+ testFilter(false,filter,"A string"); //$NON-NLS-1$
+ testFilter(false,filter,"ABCD"); //$NON-NLS-1$
+ testFilter(false,filter,"ABC"); //$NON-NLS-1$
+ testFilter(false,filter,"ABCDE"); //$NON-NLS-1$
+ testFilter(false,filter,"vABCD"); //$NON-NLS-1$
+ testFilter(false,filter,"vABC"); //$NON-NLS-1$
+ testFilter(false,filter,"vABCDE"); //$NON-NLS-1$
+ testFilter(true,filter,"abcd"); //$NON-NLS-1$
+ testFilter(false,filter,"abc"); //$NON-NLS-1$
+ testFilter(false,filter,"abcde"); //$NON-NLS-1$
+ testFilter(false,filter,"vabcd"); //$NON-NLS-1$
+ testFilter(false,filter,"vabc"); //$NON-NLS-1$
+ testFilter(false,filter,"vabcde"); //$NON-NLS-1$
+ testFilter(false,filter,"aBcd"); //$NON-NLS-1$
+ testFilter(false,filter,"aBc"); //$NON-NLS-1$
+ testFilter(false,filter,"aBcde"); //$NON-NLS-1$
+
+ filter = new StringFilter("abcd*"); //$NON-NLS-1$
+ testFilter(false,filter,"A string"); //$NON-NLS-1$
+ testFilter(false,filter,"ABCD"); //$NON-NLS-1$
+ testFilter(false,filter,"ABC"); //$NON-NLS-1$
+ testFilter(false,filter,"ABCDE"); //$NON-NLS-1$
+ testFilter(false,filter,"vABCD"); //$NON-NLS-1$
+ testFilter(false,filter,"vABC"); //$NON-NLS-1$
+ testFilter(false,filter,"vABCDE"); //$NON-NLS-1$
+ testFilter(true,filter,"abcd"); //$NON-NLS-1$
+ testFilter(false,filter,"abc"); //$NON-NLS-1$
+ testFilter(true,filter,"abcde"); //$NON-NLS-1$
+ testFilter(false,filter,"vabcd"); //$NON-NLS-1$
+ testFilter(false,filter,"vabc"); //$NON-NLS-1$
+ testFilter(false,filter,"vabcde"); //$NON-NLS-1$
+ testFilter(false,filter,"aBcd"); //$NON-NLS-1$
+ testFilter(false,filter,"aBc"); //$NON-NLS-1$
+ testFilter(false,filter,"aBcde"); //$NON-NLS-1$
+
+ filter = new StringFilter("*abcd*"); //$NON-NLS-1$
+ testFilter(false,filter,"A string"); //$NON-NLS-1$
+ testFilter(false,filter,"ABCD"); //$NON-NLS-1$
+ testFilter(false,filter,"ABC"); //$NON-NLS-1$
+ testFilter(false,filter,"ABCDE"); //$NON-NLS-1$
+ testFilter(false,filter,"vABCD"); //$NON-NLS-1$
+ testFilter(false,filter,"vABC"); //$NON-NLS-1$
+ testFilter(false,filter,"vABCDE"); //$NON-NLS-1$
+ testFilter(true,filter,"abcd"); //$NON-NLS-1$
+ testFilter(false,filter,"abc"); //$NON-NLS-1$
+ testFilter(true,filter,"abcde"); //$NON-NLS-1$
+ testFilter(true,filter,"vabcd"); //$NON-NLS-1$
+ testFilter(false,filter,"vabc"); //$NON-NLS-1$
+ testFilter(true,filter,"vabcde"); //$NON-NLS-1$
+ testFilter(false,filter,"aBcd"); //$NON-NLS-1$
+ testFilter(false,filter,"aBc"); //$NON-NLS-1$
+ testFilter(false,filter,"aBcde"); //$NON-NLS-1$
+
+ filter = new StringFilter("*abcd*efg*"); //$NON-NLS-1$
+ testFilter(false,filter,"A string"); //$NON-NLS-1$
+ testFilter(false,filter,"ABCDEFG"); //$NON-NLS-1$
+ testFilter(false,filter,"ABC"); //$NON-NLS-1$
+ testFilter(false,filter,"ABCDEFGH"); //$NON-NLS-1$
+ testFilter(false,filter,"vABCDEFG"); //$NON-NLS-1$
+ testFilter(false,filter,"vABC"); //$NON-NLS-1$
+ testFilter(false,filter,"vABCDEFG"); //$NON-NLS-1$
+ testFilter(true,filter,"abcdxefgh"); //$NON-NLS-1$
+ testFilter(true,filter,"abcdefgh"); //$NON-NLS-1$
+ testFilter(false,filter,"abc"); //$NON-NLS-1$
+ testFilter(true,filter,"abcdefghx"); //$NON-NLS-1$
+ testFilter(true,filter,"vabcdefgh"); //$NON-NLS-1$
+ testFilter(false,filter,"vabc"); //$NON-NLS-1$
+ testFilter(true,filter,"vabcdefghx"); //$NON-NLS-1$
+ testFilter(true,filter,"vabcdeefghx"); //$NON-NLS-1$
+
+ filter = new StringFilter("*abcd*defg*"); //$NON-NLS-1$
+ testFilter(true,filter,"abcdxdefg"); //$NON-NLS-1$
+ testFilter(true,filter,"abcddefg"); //$NON-NLS-1$
+ testFilter(true,filter,"abcdxdefgx"); //$NON-NLS-1$
+ testFilter(false,filter,"abcdefgh"); //$NON-NLS-1$
+ testFilter(true,filter,"vabcddefgx"); //$NON-NLS-1$
+ testFilter(true,filter,"vabcdxdefgx"); //$NON-NLS-1$
+ testFilter(false,filter,"vabc"); //$NON-NLS-1$
+ testFilter(false,filter,"aBcdxdefg"); //$NON-NLS-1$
+
+ filter = new StringFilter("*abcd*defg*",false); //$NON-NLS-1$
+ testFilter(true,filter,"abcdxdefg"); //$NON-NLS-1$
+ testFilter(true,filter,"abcddefg"); //$NON-NLS-1$
+ testFilter(true,filter,"abcdxdefgx"); //$NON-NLS-1$
+ testFilter(false,filter,"abcdefgh"); //$NON-NLS-1$
+ testFilter(true,filter,"vabcddefgx"); //$NON-NLS-1$
+ testFilter(true,filter,"vabcdxdefgx"); //$NON-NLS-1$
+ testFilter(false,filter,"vabc"); //$NON-NLS-1$
+ testFilter(false,filter,"aBcdxdefg"); //$NON-NLS-1$
+
+
+ filter = new StringFilter("*abcd*defg*",true); //$NON-NLS-1$
+ testFilter(true,filter,"abcdxdefg"); //$NON-NLS-1$
+ testFilter(true,filter,"abcddefg"); //$NON-NLS-1$
+ testFilter(true,filter,"abcdxdefgx"); //$NON-NLS-1$
+ testFilter(false,filter,"abcdefgh"); //$NON-NLS-1$
+ testFilter(true,filter,"vabcddefgx"); //$NON-NLS-1$
+ testFilter(true,filter,"vabcdxdefgx"); //$NON-NLS-1$
+ testFilter(false,filter,"vabc"); //$NON-NLS-1$
+ testFilter(true,filter,"aBcdxdefg"); //$NON-NLS-1$
+
+ }
+
+ private static void testFilter( boolean correctResult, StringFilter filter, String str ) {
+ boolean result = filter.includes(str);
+ Assert.assertEquals(correctResult, result);
+ }
+
+}
Property changes on: trunk/console/src/test/java/com/metamatrix/toolbox/ui/widget/util/TestStringFilter.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/console/src/test/java/com/metamatrix/uddi/publish/SaveBusiness.java
===================================================================
--- trunk/console/src/test/java/com/metamatrix/uddi/publish/SaveBusiness.java 2009-04-04 15:02:14 UTC (rev 714)
+++ trunk/console/src/test/java/com/metamatrix/uddi/publish/SaveBusiness.java 2009-04-04 16:42:31 UTC (rev 715)
@@ -1,5 +1,23 @@
/*
- * (c) 2008 Varsity Gateway LLC. All rights reserved.
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
*/
package com.metamatrix.uddi.publish;
More information about the teiid-commits
mailing list