12:10 p.m.
Author: vrubezhny
Date: 2007-09-11 13:10:45 -0400 (Tue, 11 Sep 2007)
New Revision: 3564
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/RunPageActionDelegate.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/server/SelectServerActionDelegate.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XDropAdapterAssistant.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectCreationOperation.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/process/SelectWebProcessItemWizardView.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/CustomCheckboxTreeAndListGroup.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizardPage.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-894 Clean out jst component
Code clean up is performed
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/RunPageActionDelegate.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/RunPageActionDelegate.java 2007-09-11
17:10:15 UTC (rev 3563)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/RunPageActionDelegate.java 2007-09-11
17:10:45 UTC (rev 3564)
@@ -19,6 +19,7 @@
import org.eclipse.jface.action.*;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.jboss.tools.common.log.LogHelper;
import org.jboss.tools.common.model.util.XModelTreeListenerSWTASync;
import org.jboss.tools.common.model.ui.dnd.DnDUtil;
import org.eclipse.jface.viewers.*;
@@ -37,6 +38,7 @@
import org.jboss.tools.jst.web.browser.wtp.RunOnServerContext;
import org.jboss.tools.jst.web.server.ServerManager;
import org.jboss.tools.jst.web.server.ServerManagerListener;
+import org.jboss.tools.jst.web.ui.WebUiPlugin;
public class RunPageActionDelegate extends AbstractModelActionDelegate implements
IWorkbenchWindowPulldownDelegate {
static AbstractBrowserContext context = RunOnServerContext.getInstance();
@@ -165,7 +167,11 @@
public void run() {
while(!stopped) {
synchronized (context.monitor) {
- try { context.monitor.wait(); } catch (Exception e) {}
+ try {
+ context.monitor.wait();
+ } catch (Exception e) {
+ WebUiPlugin.getPluginLog().logError(e);
+ }
}
if(!stopped) update();
}
@@ -181,7 +187,11 @@
stopped = true;
action = null;
synchronized (context.monitor) {
- try { context.monitor.notifyAll(); } catch (Exception e) {}
+ try {
+ context.monitor.notifyAll();
+ } catch (Exception e) {
+ WebUiPlugin.getPluginLog().logError(e);
+ }
}
if(sml != null) {
ServerManager.getInstance().removeListener(sml);
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java 2007-09-11
17:10:15 UTC (rev 3563)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/adf/AddADFSupportHelper.java 2007-09-11
17:10:45 UTC (rev 3564)
@@ -29,6 +29,7 @@
import org.jboss.tools.jst.web.WebModelPlugin;
import org.jboss.tools.jst.web.project.WebProject;
import org.jboss.tools.jst.web.project.helpers.*;
+import org.jboss.tools.jst.web.ui.WebUiPlugin;
public class AddADFSupportHelper {
static String ORACLE_ADF_LIB_FOLDER_NAME = "OracleADF";
@@ -128,7 +129,9 @@
IProject p = EclipseResourceUtil.getProject(model.getRoot());
if(p != null) try {
p.refreshLocal(IResource.DEPTH_INFINITE, null);
- } catch (Exception e) {}
+ } catch (Exception e) {
+ WebUiPlugin.getPluginLog().logError(e);
+ }
monitor.worked(20);
model.update();
monitor.worked(10);
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/server/SelectServerActionDelegate.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/server/SelectServerActionDelegate.java 2007-09-11
17:10:15 UTC (rev 3563)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/server/SelectServerActionDelegate.java 2007-09-11
17:10:45 UTC (rev 3564)
@@ -28,6 +28,7 @@
import org.eclipse.wst.server.ui.internal.wizard.NewServerWizard;
import org.jboss.tools.common.model.ui.ModelUIImages;
import org.jboss.tools.jst.web.server.*;
+import org.jboss.tools.jst.web.ui.WebUiPlugin;
public class SelectServerActionDelegate extends AbstractServerActionDelegate implements
IWorkbenchWindowPulldownDelegate {
@@ -177,6 +178,7 @@
imageRegistry.put(typeId, imageDescriptor);
imageDescriptors.put(typeId, imageDescriptor);
} catch (Exception t) {
+ WebUiPlugin.getPluginLog().logError(t);
}
}
}
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XDropAdapterAssistant.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XDropAdapterAssistant.java 2007-09-11
17:10:15 UTC (rev 3563)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XDropAdapterAssistant.java 2007-09-11
17:10:45 UTC (rev 3564)
@@ -48,6 +48,7 @@
try {
DnDUtil.paste(targetObject, p);
} catch (ActionDeclinedException de) {
+ return null;
} catch (Exception e) {
ProblemReportingHelper.reportProblem(ModelUIPlugin.PLUGIN_ID, e);
}
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java 2007-09-11
17:10:15 UTC (rev 3563)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java 2007-09-11
17:10:45 UTC (rev 3564)
@@ -438,7 +438,7 @@
EclipseResourceUtil.removeNatureFromProject(getProject(), JavaCore.NATURE_ID);
getProject().delete(true, null);
} catch (Exception e) {
- //ignore
+ WebUiPlugin.getPluginLog().logError(e);
}
throw (t instanceof CoreException) ? (CoreException)t
: new CoreException(new org.eclipse.core.runtime.Status(IStatus.ERROR, getNatureID(),
org.eclipse.core.runtime.IStatus.ERROR, "" + t.getMessage(), t));
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectCreationOperation.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectCreationOperation.java 2007-09-11
17:10:15 UTC (rev 3563)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectCreationOperation.java 2007-09-11
17:10:45 UTC (rev 3564)
@@ -194,7 +194,7 @@
try {
createTemplateModel();
} catch (Exception e) {
- //ignore
+ WebUiPlugin.getPluginLog().logError(e);
}
if(templateModel != null) {
XModelObject o = FileSystemsHelper.getFileSystem(templateModel, "src");
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/process/SelectWebProcessItemWizardView.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/process/SelectWebProcessItemWizardView.java 2007-09-11
17:10:15 UTC (rev 3563)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/process/SelectWebProcessItemWizardView.java 2007-09-11
17:10:45 UTC (rev 3564)
@@ -37,6 +37,7 @@
import org.jboss.tools.common.meta.key.WizardKeys;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.jst.web.ui.WebUiPlugin;
public abstract class SelectWebProcessItemWizardView extends AbstractQueryWizardView {
private Properties p;
@@ -209,7 +210,11 @@
public void dispose() {}
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- try { viewer.refresh(); } catch (Exception e) {}
+ try {
+ viewer.refresh();
+ } catch (Exception e) {
+ WebUiPlugin.getPluginLog().logError(e);
+ }
}
public Image getColumnImage(Object element, int columnIndex) {
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/CustomCheckboxTreeAndListGroup.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/CustomCheckboxTreeAndListGroup.java 2007-09-11
17:10:15 UTC (rev 3563)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/CustomCheckboxTreeAndListGroup.java 2007-09-11
17:10:45 UTC (rev 3564)
@@ -41,7 +41,9 @@
setCurrentTreeSelection(listElement.getParentFile());
try {
super.listItemChecked(listElement, true, true);
- } catch (Exception e) {}
+ } catch (Exception e) {
+ WebUiPlugin.getPluginLog().logError(e);
+ }
setCurrentTreeSelection(null);
}
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizardPage.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizardPage.java 2007-09-11
17:10:15 UTC (rev 3563)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizardPage.java 2007-09-11
17:10:45 UTC (rev 3564)
@@ -45,6 +45,7 @@
import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.jst.web.context.ImportWebDirProjectContext;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
+import org.jboss.tools.jst.web.ui.WebUiPlugin;
public class ImportWebProjectWizardPage extends WizardPage {
private ImportWebDirProjectContext context;
@@ -338,6 +339,7 @@
context.setProjectName(getProjectNameValue());
context.setWebXmlLocation(getWebXmlLocationValue());
} catch (Exception ex) {
+ WebUiPlugin.getPluginLog().logError(ex);
}
}