JBoss Tools SVN: r3567 - trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2007-09-11 13:11:37 -0400 (Tue, 11 Sep 2007)
New Revision: 3567
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesCompoundEditor.java
trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesGuiEditor.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.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesCompoundEditor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesCompoundEditor.java 2007-09-11 17:11:25 UTC (rev 3566)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesCompoundEditor.java 2007-09-11 17:11:37 UTC (rev 3567)
@@ -74,7 +74,11 @@
public void dispose() {
if(input != null) {
selectionProvider.setHost(null);
- try { getSite().setSelectionProvider(null); } catch (Exception e) {}
+ try {
+ getSite().setSelectionProvider(null);
+ } catch (Exception e) {
+ // Ignore
+ }
}
super.dispose();
if(guiEditor != null) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesGuiEditor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesGuiEditor.java 2007-09-11 17:11:25 UTC (rev 3566)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesGuiEditor.java 2007-09-11 17:11:37 UTC (rev 3567)
@@ -18,6 +18,7 @@
import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.IFileEditorInput;
+import org.jboss.tools.common.log.LogHelper;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput;
@@ -95,7 +96,11 @@
if(gui != null) {
gui.dispose();
gui = null;
- try { control.dispose(); } catch (Exception e) {}
+ try {
+ control.dispose();
+ } catch (Exception e) {
+ TilesUIPlugin.getPluginLog().logError(e);
+ }
control = null;
}
}
16 years, 9 months
JBoss Tools SVN: r3566 - in trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web: model/handlers and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2007-09-11 13:11:25 -0400 (Tue, 11 Sep 2007)
New Revision: 3566
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/CreateJSPFileSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddPageTemplateSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateResourcesStep.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/FileTLDRecognizer.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ImportTLDToPaletteSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/JSPAdopt.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/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java 2007-09-11 17:10:59 UTC (rev 3565)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java 2007-09-11 17:11:25 UTC (rev 3566)
@@ -85,7 +85,7 @@
// in menu now it throws exception Invalid Artifact Edit access
ms = ServerUtil.getModule(p);
} catch (Exception e) {
- // ignore
+ WebModelPlugin.getPluginLog().logError(e);
}
// WebResource wr = (ms == null || ms.length == 0) ? null : new WebResource(ms[0], new Path(""));
WebResource wr = (ms == null) ? null : new WebResource(ms, new Path("")); //$NON-NLS-1$
@@ -128,7 +128,7 @@
try {
server.getModules();
} catch (Exception e) {
- //ignore
+ WebModelPlugin.getPluginLog().logError(e);
}
String launchMode = ILaunchManager.DEBUG_MODE.equals(server.getMode()) ? ILaunchManager.DEBUG_MODE : ILaunchManager.RUN_MODE;
try {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/CreateJSPFileSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/CreateJSPFileSupport.java 2007-09-11 17:10:59 UTC (rev 3565)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/CreateJSPFileSupport.java 2007-09-11 17:11:25 UTC (rev 3566)
@@ -80,7 +80,7 @@
defaultPageTemplate = obj.getAttributeValue("Page Template");
}
} catch (Exception x) {
- //ignore
+ WebModelPlugin.getPluginLog().logError(x);
}
return defaultPageTemplate;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddPageTemplateSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddPageTemplateSupport.java 2007-09-11 17:10:59 UTC (rev 3565)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddPageTemplateSupport.java 2007-09-11 17:11:25 UTC (rev 3566)
@@ -25,6 +25,7 @@
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.jst.web.WebModelPlugin;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
import org.jboss.tools.jst.web.project.helpers.AbstractWebProjectTemplate;
@@ -126,7 +127,9 @@
this.pagePath = pagePath;
try {
selectedFile = ModelPlugin.getWorkspace().getRoot().getFile(new Path(pagePath));
- } catch (Exception e) {}
+ } catch (Exception e) {
+ WebModelPlugin.getPluginLog().logError(e);
+ }
return selectedFile;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateResourcesStep.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateResourcesStep.java 2007-09-11 17:10:59 UTC (rev 3565)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateResourcesStep.java 2007-09-11 17:11:25 UTC (rev 3566)
@@ -103,7 +103,7 @@
try {
set.add(f.getCanonicalPath());
} catch (Exception e) {
- //ignore
+ WebModelPlugin.getPluginLog().logError(e);
}
}
}
@@ -118,7 +118,7 @@
try {
path = pathname.getCanonicalPath();
} catch (Exception e) {
- //ignore
+ WebModelPlugin.getPluginLog().logError(e);
}
return path != null && !set.contains(path);
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/FileTLDRecognizer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/FileTLDRecognizer.java 2007-09-11 17:10:59 UTC (rev 3565)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/FileTLDRecognizer.java 2007-09-11 17:11:25 UTC (rev 3566)
@@ -12,13 +12,16 @@
import org.jboss.tools.common.model.loaders.*;
import org.jboss.tools.common.xml.XMLEntityResolver;
+import org.jboss.tools.jst.web.WebModelPlugin;
public class FileTLDRecognizer implements EntityRecognizer, TLDConstants {
static {
try {
XMLEntityResolver.registerPublicEntity(TLD_DOC_PUBLICID_1_1, FileTLDRecognizer.class, "/meta/web-jsptaglibrary_1_1.dtd");
XMLEntityResolver.registerPublicEntity(TLD_DOC_PUBLICID_1_2, FileTLDRecognizer.class, "/meta/web-jsptaglibrary_1_2.dtd");
- } catch (Exception e) {}
+ } catch (Exception e) {
+ WebModelPlugin.getPluginLog().logError(e);
+ }
}
static String VERSION_2_0 = "version=\"2.0\"";
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ImportTLDToPaletteSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ImportTLDToPaletteSupport.java 2007-09-11 17:10:59 UTC (rev 3565)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/ImportTLDToPaletteSupport.java 2007-09-11 17:11:25 UTC (rev 3566)
@@ -22,6 +22,7 @@
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
+import org.jboss.tools.jst.web.WebModelPlugin;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
import org.jboss.tools.jst.web.model.tree.AllTldsTree;
import org.jboss.tools.jst.web.tld.URIConstants;
@@ -108,7 +109,9 @@
this.path = path;
try {
selectedFile = tree.find(path);
- } catch (Exception e) {}
+ } catch (Exception e) {
+ WebModelPlugin.getPluginLog().logError(e);
+ }
return selectedFile;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/JSPAdopt.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/JSPAdopt.java 2007-09-11 17:10:59 UTC (rev 3565)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/JSPAdopt.java 2007-09-11 17:11:25 UTC (rev 3566)
@@ -69,7 +69,11 @@
public void adoptAttribute(XModelObject target, XModelObject object, Properties p) {
if(p == null) return;
int c = -1;
- try { c = Integer.parseInt(p.getProperty("pos")); } catch (Exception e) {}
+ try {
+ c = Integer.parseInt(p.getProperty("pos"));
+ } catch (Exception e) {
+ // Ignore
+ }
if(c < 0) return;
String text = p.getProperty("text");
String pref = (c == 0 || Character.isWhitespace(text.charAt(c - 1))) ? "" : " ";
16 years, 9 months
JBoss Tools SVN: r3565 - in trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug: xpl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2007-09-11 13:10:59 -0400 (Tue, 11 Sep 2007)
New Revision: 3565
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/WebDebugPlugin.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/xpl/EvaluationSupport.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.debug/src/org/jboss/tools/jst/web/debug/WebDebugPlugin.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/WebDebugPlugin.java 2007-09-11 17:10:45 UTC (rev 3564)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/WebDebugPlugin.java 2007-09-11 17:10:59 UTC (rev 3565)
@@ -13,14 +13,15 @@
import org.eclipse.core.runtime.IPluginDescriptor;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.jboss.tools.common.log.BaseUIPlugin;
-public class WebDebugPlugin extends AbstractUIPlugin {
+public class WebDebugPlugin extends BaseUIPlugin {
static WebDebugPlugin INSTANCE = null;
public static final String PLUGIN_ID = "org.jboss.tools.jst.web.debug";
- public WebDebugPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
+ public WebDebugPlugin() {
+ super();
INSTANCE = this;
}
@@ -28,6 +29,10 @@
return INSTANCE;
}
+ public static WebDebugPlugin getPluginLog() {
+ return WebDebugPlugin.getDefault();
+ }
+
public static boolean isDebugEnabled() {
return getDefault().isDebugging();
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/xpl/EvaluationSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/xpl/EvaluationSupport.java 2007-09-11 17:10:45 UTC (rev 3564)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/xpl/EvaluationSupport.java 2007-09-11 17:10:59 UTC (rev 3565)
@@ -26,6 +26,8 @@
import org.eclipse.jdt.debug.eval.IEvaluationListener;
import org.eclipse.jdt.debug.eval.IEvaluationResult;
import org.eclipse.jdt.internal.debug.core.model.JDIStackFrame;
+import org.jboss.tools.jst.web.WebModelPlugin;
+import org.jboss.tools.jst.web.debug.WebDebugPlugin;
/**
* @author Jeremy
@@ -49,7 +51,7 @@
ICompiledExpression compiledExpression = engine.getCompiledExpression(expression, (JDIStackFrame)frame);
engine.evaluateExpression(compiledExpression, (IJavaStackFrame)frame, evaluationListener, DebugEvent.EVALUATION_IMPLICIT, false);
} catch (Exception x) {
- //ignore
+ WebDebugPlugin.getPluginLog().logError(x);
}
}
@@ -76,7 +78,11 @@
IEvaluationResult result = null;
while (IsWaiting()) {
Thread.yield();
- try {Thread.sleep(100);} catch (Exception x) {}
+ try {
+ Thread.sleep(100);
+ } catch (Exception x) {
+ // Ignore
+ }
}
synchronized (this) {
@@ -113,7 +119,7 @@
DebugEvent.EVALUATION_IMPLICIT, false);
result = evaluationListener.getResult();
} catch (Exception x) {
- //ignore
+ WebDebugPlugin.getPluginLog().logError(x);
}
return result;
}
@@ -146,6 +152,7 @@
}
}
} catch (Exception e) {
+ WebDebugPlugin.getPluginLog().logError(e);
}
return null;
}
@@ -161,6 +168,7 @@
}
}
} catch (Exception e) {
+ WebDebugPlugin.getPluginLog().logError(e);
}
return null;
}
16 years, 9 months
JBoss Tools SVN: r3564 - in trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui: action/adf and 5 other directories.
by jbosstools-commits＠lists.jboss.org
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);
}
}
16 years, 9 months
JBoss Tools SVN: r3563 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2007-09-11 13:10:15 -0400 (Tue, 11 Sep 2007)
New Revision: 3563
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdJSFIDResource.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdTaglibResource.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.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdJSFIDResource.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdJSFIDResource.java 2007-09-11 14:56:20 UTC (rev 3562)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdJSFIDResource.java 2007-09-11 17:10:15 UTC (rev 3563)
@@ -14,6 +14,7 @@
import java.util.*;
import org.eclipse.ui.IEditorInput;
import org.jboss.tools.common.kb.*;
+import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
public class WTPKbdJSFIDResource extends WTPKbAbstractModelResource {
@@ -53,7 +54,7 @@
}
}
} catch (Exception x) {
- //ignore
+ JspEditorPlugin.getPluginLog().logError(x);
}
return proposals;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdTaglibResource.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdTaglibResource.java 2007-09-11 14:56:20 UTC (rev 3562)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdTaglibResource.java 2007-09-11 17:10:15 UTC (rev 3563)
@@ -24,6 +24,7 @@
import org.jboss.tools.common.kb.KbDinamicResource;
import org.jboss.tools.common.kb.KbIcon;
import org.jboss.tools.common.kb.KbProposal;
+import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
public class WTPKbdTaglibResource extends WTPKbAbstractModelResource {
@@ -61,7 +62,7 @@
}
}
} catch (Exception x) {
- //ignore
+ JspEditorPlugin.getPluginLog().logError(x);
}
return proposals;
}
16 years, 9 months
JBoss Tools SVN: r3562 - in trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui: action and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-09-11 10:56:20 -0400 (Tue, 11 Sep 2007)
New Revision: 3562
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/JsfUiImages.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/AddCapabilitiesActionDelegate.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/JSFMultiPageContributor.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/adopt/JSPAdopt.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/FacesConfigEditorMessages.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/JSFEditor.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/dnd/DndHelper.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/model/commands/JSFCompoundCommand.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/model/impl/JSFElement.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/model/impl/Segment.java
Log:
JBIDE-895
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/JsfUiImages.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/JsfUiImages.java 2007-09-11 14:50:51 UTC (rev 3561)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/JsfUiImages.java 2007-09-11 14:56:20 UTC (rev 3562)
@@ -36,7 +36,7 @@
);
} catch (MalformedURLException e) {
-
+ JsfUiPlugin.getPluginLog().logError(e);
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/AddCapabilitiesActionDelegate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/AddCapabilitiesActionDelegate.java 2007-09-11 14:50:51 UTC (rev 3561)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/AddCapabilitiesActionDelegate.java 2007-09-11 14:56:20 UTC (rev 3562)
@@ -16,17 +16,13 @@
import org.jboss.tools.common.model.ui.action.file.ProjectRootActionDelegate;
public class AddCapabilitiesActionDelegate extends ProjectRootActionDelegate {
+
protected String getActionPath() {
return "EclipseActions.AddCustomJSFCapabilities";
}
protected boolean hasModelNature(IProject project) {
- try {
- if(EclipseResourceUtil.getModelNature(project) != null) return true;
- } catch (Exception e) {
- //ignore
- }
- return false;
+ return EclipseResourceUtil.getModelNature(project) != null;
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/JSFMultiPageContributor.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/JSFMultiPageContributor.java 2007-09-11 14:50:51 UTC (rev 3561)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/JSFMultiPageContributor.java 2007-09-11 14:56:20 UTC (rev 3562)
@@ -25,6 +25,7 @@
import org.eclipse.ui.ide.IDEActionFactory;
import org.eclipse.ui.texteditor.ITextEditor;
import org.jboss.tools.common.gef.action.ActionRegistrySupport;
+import org.jboss.tools.jsf.ui.JsfUiPlugin;
import org.jboss.tools.jsf.ui.editor.FacesConfigGuiEditor;
import org.jboss.tools.jsf.ui.editor.actions.JSFCutRetargetAction;
@@ -120,10 +121,12 @@
}
try {
- fToggleOccurencesMarkUp.setEditor(getTextEditor(part));
- fToggleOccurencesMarkUp.update();
+ if(fToggleOccurencesMarkUp != null) {
+ fToggleOccurencesMarkUp.setEditor(getTextEditor(part));
+ fToggleOccurencesMarkUp.update();
+ }
} catch (Exception x) {
- //ignore
+ JsfUiPlugin.getPluginLog().logError(x);
}
updateStatus();
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/adopt/JSPAdopt.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/adopt/JSPAdopt.java 2007-09-11 14:50:51 UTC (rev 3561)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/adopt/JSPAdopt.java 2007-09-11 14:56:20 UTC (rev 3562)
@@ -56,8 +56,11 @@
String bundle = getBundle(object.getParent());
int pos = -1;
try {
- pos = Integer.parseInt(p.getProperty("pos"));
- } catch (Exception e) {}
+ String s = p.getProperty("pos");
+ if(s != null && s.length() > 0) pos = Integer.parseInt(s);
+ } catch (Exception e) {
+ JsfUiPlugin.getPluginLog().logError(e);
+ }
SourceViewer viewer = (SourceViewer)p.get("viewer");
JSPTokenizer tokenizer = new JSPTokenizer();
@@ -112,7 +115,9 @@
viewer.getDocument().replace(pos, 0, start);
viewer.setSelectedRange(pos, 0);
viewer.getTextWidget().setFocus();
- } catch (Exception e) {}
+ } catch (Exception e) {
+ JsfUiPlugin.getPluginLog().logError(e);
+ }
p.remove("start text");
}
@@ -158,8 +163,11 @@
int pos = -1;
try {
- pos = Integer.parseInt(p.getProperty("pos"));
- } catch (Exception e) {}
+ String s = p.getProperty("pos");
+ if(s != null && s.length() > 0) pos = Integer.parseInt(s);
+ } catch (Exception e) {
+ JsfUiPlugin.getPluginLog().logError(e);
+ }
SourceViewer viewer = (SourceViewer)p.get("viewer");
JSPTokenizer tokenizer = new JSPTokenizer();
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/FacesConfigEditorMessages.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/FacesConfigEditorMessages.java 2007-09-11 14:50:51 UTC (rev 3561)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/FacesConfigEditorMessages.java 2007-09-11 14:56:20 UTC (rev 3562)
@@ -15,6 +15,7 @@
import java.util.ResourceBundle;
import org.eclipse.osgi.util.NLS;
+import org.jboss.tools.jsf.ui.JsfUiPlugin;
/**
* @author Igels
@@ -56,6 +57,7 @@
fResourceBundle = ResourceBundle.getBundle(BUNDLE_NAME, Locale.getDefault());
}
catch (MissingResourceException x) {
+ JsfUiPlugin.getPluginLog().logError(x);
fResourceBundle = null;
}
return fResourceBundle;
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/JSFEditor.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/JSFEditor.java 2007-09-11 14:50:51 UTC (rev 3561)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/JSFEditor.java 2007-09-11 14:56:20 UTC (rev 3562)
@@ -110,6 +110,7 @@
import org.jboss.tools.common.reporting.ProblemReportingHelper;
import org.jboss.tools.jsf.messages.JSFUIMessages;
import org.jboss.tools.jsf.model.helpers.JSFProcessStructureHelper;
+import org.jboss.tools.jsf.ui.JsfUiPlugin;
import org.jboss.tools.jsf.ui.editor.actions.JSFCopyAction;
import org.jboss.tools.jsf.ui.editor.actions.JSFCutAction;
import org.jboss.tools.jsf.ui.editor.actions.JSFDeleteAction;
@@ -173,6 +174,7 @@
if (delta != null)
delta.accept(this);
} catch (CoreException exception) {
+ JsfUiPlugin.getPluginLog().logError(exception);
// What should be done here?
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/dnd/DndHelper.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/dnd/DndHelper.java 2007-09-11 14:50:51 UTC (rev 3561)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/dnd/DndHelper.java 2007-09-11 14:56:20 UTC (rev 3562)
@@ -18,6 +18,7 @@
import org.eclipse.draw2d.geometry.Point;
import org.jboss.tools.common.model.ui.dnd.DnDUtil;
import org.jboss.tools.common.meta.action.XAction;
+import org.jboss.tools.jsf.ui.JsfUiPlugin;
public class DndHelper{
@@ -40,6 +41,7 @@
try {
copy.executeHandler((XModelObject) source, properties);
} catch (Exception e) {
+ JsfUiPlugin.getPluginLog().logError(e);
XModelTransferBuffer.getInstance().disable();
return false;
}
@@ -63,7 +65,7 @@
try {
DnDUtil.paste((XModelObject) target, properties);
} catch (Exception ex) {
- //ignore
+ JsfUiPlugin.getPluginLog().logError(ex);
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/model/commands/JSFCompoundCommand.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/model/commands/JSFCompoundCommand.java 2007-09-11 14:50:51 UTC (rev 3561)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/model/commands/JSFCompoundCommand.java 2007-09-11 14:56:20 UTC (rev 3562)
@@ -18,6 +18,7 @@
import org.jboss.tools.common.meta.action.XAction;
import org.jboss.tools.common.meta.action.XActionInvoker;
import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.jsf.ui.JsfUiPlugin;
public class JSFCompoundCommand extends Command {
private List<Object> elements = new ArrayList<Object>();
@@ -38,6 +39,7 @@
if(action != null) return true;
else return false;
}catch(Exception ex){
+ JsfUiPlugin.getPluginLog().logError(ex);
return false;
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/model/impl/JSFElement.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/model/impl/JSFElement.java 2007-09-11 14:50:51 UTC (rev 3561)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/model/impl/JSFElement.java 2007-09-11 14:56:20 UTC (rev 3562)
@@ -23,6 +23,7 @@
import org.jboss.tools.common.model.*;
import org.jboss.tools.common.meta.*;
+import org.jboss.tools.jsf.ui.JsfUiPlugin;
import org.jboss.tools.jsf.ui.editor.model.IJSFElement;
import org.jboss.tools.jsf.ui.editor.model.IJSFModel;
@@ -116,6 +117,7 @@
if (oldValue == null ||!oldValue.equals(newValue))
getJSFModel().setModified(true);
} catch (Exception exception) {
+ JsfUiPlugin.getPluginLog().logError(exception);
if (newValue != null)
getJSFModel().setModified(true);
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/model/impl/Segment.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/model/impl/Segment.java 2007-09-11 14:50:51 UTC (rev 3561)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/model/impl/Segment.java 2007-09-11 14:56:20 UTC (rev 3562)
@@ -10,8 +10,11 @@
******************************************************************************/
package org.jboss.tools.jsf.ui.editor.model.impl;
+import java.beans.PropertyVetoException;
+
import org.w3c.dom.*;
+import org.jboss.tools.jsf.ui.JsfUiPlugin;
import org.jboss.tools.jsf.ui.editor.model.ILink;
import org.jboss.tools.jsf.ui.editor.model.ISegment;
@@ -23,9 +26,17 @@
super(parent);
try {
setName("SEGMENT");
- length = Integer.parseInt(segmentElement.getAttribute("length"));
+ String s = segmentElement.getAttribute("length");
+ if(s == null || s.length() == 0) {
+ length = 0;
+ } else {
+ length = Integer.parseInt(s);
+ }
+ } catch(PropertyVetoException exception) {
+ length = 0;
} catch(Exception exception) {
- length = 0;
+ length = 0;
+ JsfUiPlugin.getPluginLog().logError(exception);
}
this.prevSegment = prevSegment;
if(prevSegment!=null)
@@ -37,7 +48,7 @@
try {
setName("SEGMENT");
this.length = length;
- } catch(Exception exception) {
+ } catch(PropertyVetoException exception) {
length = 0;
}
16 years, 9 months
JBoss Tools SVN: r3561 - trunk/shale/plugins/org.jboss.tools.shale.ui/src/org/jboss/tools/shale/ui/clay/editor.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2007-09-11 10:50:51 -0400 (Tue, 11 Sep 2007)
New Revision: 3561
Modified:
trunk/shale/plugins/org.jboss.tools.shale.ui/src/org/jboss/tools/shale/ui/clay/editor/ClayCompoundEditor.java
trunk/shale/plugins/org.jboss.tools.shale.ui/src/org/jboss/tools/shale/ui/clay/editor/ClayGuiEditor.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-892 Clean out shale component
Wrong files were uploaded during code clean up
Modified: trunk/shale/plugins/org.jboss.tools.shale.ui/src/org/jboss/tools/shale/ui/clay/editor/ClayCompoundEditor.java
===================================================================
--- trunk/shale/plugins/org.jboss.tools.shale.ui/src/org/jboss/tools/shale/ui/clay/editor/ClayCompoundEditor.java 2007-09-11 14:50:39 UTC (rev 3560)
+++ trunk/shale/plugins/org.jboss.tools.shale.ui/src/org/jboss/tools/shale/ui/clay/editor/ClayCompoundEditor.java 2007-09-11 14:50:51 UTC (rev 3561)
@@ -73,7 +73,11 @@
public void dispose() {
if(input != null) {
selectionProvider.setHost(null);
- try { getSite().setSelectionProvider(null); } catch (Exception e) {}
+ try {
+ getSite().setSelectionProvider(null);
+ } catch (Exception e) {
+ ShaleUiPlugin.log(e);
+ }
}
super.dispose();
if(guiEditor != null) {
Modified: trunk/shale/plugins/org.jboss.tools.shale.ui/src/org/jboss/tools/shale/ui/clay/editor/ClayGuiEditor.java
===================================================================
--- trunk/shale/plugins/org.jboss.tools.shale.ui/src/org/jboss/tools/shale/ui/clay/editor/ClayGuiEditor.java 2007-09-11 14:50:39 UTC (rev 3560)
+++ trunk/shale/plugins/org.jboss.tools.shale.ui/src/org/jboss/tools/shale/ui/clay/editor/ClayGuiEditor.java 2007-09-11 14:50:51 UTC (rev 3561)
@@ -91,7 +91,11 @@
if(gui != null) {
gui.dispose();
gui = null;
- try { control.dispose(); } catch (Exception e) {}
+ try {
+ control.dispose();
+ } catch (Exception e) {
+ ShaleUiPlugin.log(e);
+ }
control = null;
}
}
16 years, 9 months
JBoss Tools SVN: r3560 - trunk/shale/plugins/org.jboss.tools.shale.text.ext/src/org/jboss/tools/shale/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2007-09-11 10:50:39 -0400 (Tue, 11 Sep 2007)
New Revision: 3560
Modified:
trunk/shale/plugins/org.jboss.tools.shale.text.ext/src/org/jboss/tools/shale/text/ext/hyperlink/ShaleComponentJSFIDHyperlink.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-892 Clean out shale component
Wrong files were uploaded during code clean up
Modified: trunk/shale/plugins/org.jboss.tools.shale.text.ext/src/org/jboss/tools/shale/text/ext/hyperlink/ShaleComponentJSFIDHyperlink.java
===================================================================
--- trunk/shale/plugins/org.jboss.tools.shale.text.ext/src/org/jboss/tools/shale/text/ext/hyperlink/ShaleComponentJSFIDHyperlink.java 2007-09-11 14:37:10 UTC (rev 3559)
+++ trunk/shale/plugins/org.jboss.tools.shale.text.ext/src/org/jboss/tools/shale/text/ext/hyperlink/ShaleComponentJSFIDHyperlink.java 2007-09-11 14:50:39 UTC (rev 3560)
@@ -26,6 +26,7 @@
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
+import org.jboss.tools.shale.ShaleModelPlugin;
public class ShaleComponentJSFIDHyperlink extends AbstractHyperlink {
@@ -51,6 +52,7 @@
openFileFailed();
}
} catch (Exception x) {
+ ShaleModelPlugin.getPluginLog().logError(x);
}
}
16 years, 9 months
JBoss Tools SVN: r3558 - in trunk/struts/plugins/org.jboss.tools.struts.debug: reports and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2007-09-11 10:26:32 -0400 (Tue, 11 Sep 2007)
New Revision: 3558
Added:
trunk/struts/plugins/org.jboss.tools.struts.debug/reports/
trunk/struts/plugins/org.jboss.tools.struts.debug/reports/pmd-report.csv
trunk/struts/plugins/org.jboss.tools.struts.debug/reports/pmd-report.html
trunk/struts/plugins/org.jboss.tools.struts.debug/reports/pmd-report.txt
trunk/struts/plugins/org.jboss.tools.struts.debug/reports/pmd-report.vb.html
trunk/struts/plugins/org.jboss.tools.struts.debug/reports/pmd-report.xml
Modified:
trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionBreakpoint.java
trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionConditionBreakpoint.java
trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/StrutsDebugPlugin.java
trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/step/ActionExceptionCheckElement.java
trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/step/ActionFormCheckElement.java
trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/step/ActionForwardCheckElement.java
trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/step/GlobalExceptionCheckElement.java
trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/step/GlobalForwardCheckElement.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-891 Clean out struts component
Code clean up is performed
Added: trunk/struts/plugins/org.jboss.tools.struts.debug/reports/pmd-report.csv
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.debug/reports/pmd-report.csv (rev 0)
+++ trunk/struts/plugins/org.jboss.tools.struts.debug/reports/pmd-report.csv 2007-09-11 14:26:32 UTC (rev 3558)
@@ -0,0 +1 @@
+"Problem","Package","File","Priority","Line","Description","Rule set","Rule"
Added: trunk/struts/plugins/org.jboss.tools.struts.debug/reports/pmd-report.html
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.debug/reports/pmd-report.html (rev 0)
+++ trunk/struts/plugins/org.jboss.tools.struts.debug/reports/pmd-report.html 2007-09-11 14:26:32 UTC (rev 3558)
@@ -0,0 +1,4 @@
+<html><head><title>PMD</title></head><body>
+<center><h3>PMD report</h3></center><center><h3>Problems found</h3></center><table align="center" cellspacing="0" cellpadding="3"><tr>
+<th>#</th><th>File</th><th>Line</th><th>Problem</th></tr>
+</table></body></html>
\ No newline at end of file
Property changes on: trunk/struts/plugins/org.jboss.tools.struts.debug/reports/pmd-report.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/struts/plugins/org.jboss.tools.struts.debug/reports/pmd-report.txt
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.debug/reports/pmd-report.txt (rev 0)
+++ trunk/struts/plugins/org.jboss.tools.struts.debug/reports/pmd-report.txt 2007-09-11 14:26:32 UTC (rev 3558)
@@ -0,0 +1 @@
+No problems found!
\ No newline at end of file
Property changes on: trunk/struts/plugins/org.jboss.tools.struts.debug/reports/pmd-report.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/struts/plugins/org.jboss.tools.struts.debug/reports/pmd-report.vb.html
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.debug/reports/pmd-report.vb.html (rev 0)
+++ trunk/struts/plugins/org.jboss.tools.struts.debug/reports/pmd-report.vb.html 2007-09-11 14:26:32 UTC (rev 3558)
@@ -0,0 +1,8 @@
+<html><head><title>PMD</title></head><style type="text/css"><!--
+body { background-color: white; font-family:verdana, arial, helvetica, geneva; font-size: 16px; font-style: italic; color: black; }
+.title { font-family: verdana, arial, helvetica,geneva; font-size: 12px; font-weight:bold; color: white; }
+.body { font-family: verdana, arial, helvetica, geneva; font-size: 12px; font-weight:plain; color: black; }
+#TableHeader { background-color: #003366; }
+#RowColor1 { background-color: #eeeeee; }
+#RowColor2 { background-color: white; }
+--></style><body><center><br></center></body></html>
\ No newline at end of file
Property changes on: trunk/struts/plugins/org.jboss.tools.struts.debug/reports/pmd-report.vb.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/struts/plugins/org.jboss.tools.struts.debug/reports/pmd-report.xml
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.debug/reports/pmd-report.xml (rev 0)
+++ trunk/struts/plugins/org.jboss.tools.struts.debug/reports/pmd-report.xml 2007-09-11 14:26:32 UTC (rev 3558)
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pmd version="4.0rc1" timestamp="2007-09-10T16:39:27.578" elapsedTime="0s">
+</pmd>
\ No newline at end of file
Property changes on: trunk/struts/plugins/org.jboss.tools.struts.debug/reports/pmd-report.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionBreakpoint.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionBreakpoint.java 2007-09-11 14:26:02 UTC (rev 3557)
+++ trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionBreakpoint.java 2007-09-11 14:26:32 UTC (rev 3558)
@@ -17,8 +17,6 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.model.ISourceLocator;
import org.eclipse.debug.core.model.IStackFrame;
import org.eclipse.jdt.debug.core.IJavaStackFrame;
import org.eclipse.jdt.internal.debug.core.breakpoints.JavaMethodBreakpoint;
@@ -28,7 +26,6 @@
import org.jboss.tools.jst.web.debug.WebDebugPlugin;
import org.jboss.tools.jst.web.debug.xpl.DebugSupport;
import org.jboss.tools.jst.web.launching.sourcelookup.IBreakpointSourceFinder;
-import org.jboss.tools.jst.web.launching.sourcelookup.xpl.WebSourceLocator;
import com.sun.jdi.event.Event;
Modified: trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionConditionBreakpoint.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionConditionBreakpoint.java 2007-09-11 14:26:02 UTC (rev 3557)
+++ trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/ActionConditionBreakpoint.java 2007-09-11 14:26:32 UTC (rev 3558)
@@ -28,7 +28,6 @@
import org.eclipse.jdt.debug.eval.ICompiledExpression;
import org.eclipse.jdt.debug.eval.IEvaluationListener;
import org.eclipse.jdt.debug.eval.IEvaluationResult;
-import org.eclipse.jdt.internal.debug.core.JDIDebugPlugin;
import org.eclipse.jdt.internal.debug.core.model.JDIDebugTarget;
import org.eclipse.jdt.internal.debug.core.model.JDIStackFrame;
import org.eclipse.jdt.internal.debug.core.model.JDIThread;
@@ -112,7 +111,7 @@
return handleConditionalBreakpointEvent(event, thread, target);
} catch (CoreException e) {
- JDIDebugPlugin.log(e);
+ StrutsDebugPlugin.log(e);
}
return true;
}
@@ -239,7 +238,7 @@
}
return;
} catch (DebugException e) {
- JDIDebugPlugin.log(e);
+ StrutsDebugPlugin.log(e);
}
suspendForEvent(event, thread);
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/StrutsDebugPlugin.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/StrutsDebugPlugin.java 2007-09-11 14:26:02 UTC (rev 3557)
+++ trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/StrutsDebugPlugin.java 2007-09-11 14:26:32 UTC (rev 3558)
@@ -10,15 +10,13 @@
******************************************************************************/
package org.jboss.tools.struts.debug.internal;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.jboss.tools.common.log.BaseUIPlugin;
-public class StrutsDebugPlugin extends AbstractUIPlugin {
+public class StrutsDebugPlugin extends BaseUIPlugin {
public static final String PLUGIN_ID = "org.jboss.tools.struts.debug";
@@ -27,18 +25,19 @@
StrutsDebugModel.init();
}
- public void startup( ) throws CoreException {
- super.startup();
- }
-
public static void printStackTrace(Throwable throwable) {
- if (isDebugEnabled() && throwable != null) throwable.printStackTrace();
+ if (isDebugEnabled() && throwable != null) {
+ throwable.printStackTrace();
+ }
}
public static void println(String str) {
if (isDebugEnabled()) {
- if (str != null) System.out.println(str);
- else System.out.println();
+ if (str != null) {
+ System.out.println(str);
+ } else {
+ System.out.println();
+ }
}
}
@@ -59,11 +58,15 @@
}
public static void log(String msg) {
- if(isDebugEnabled()) PluginHolder.INSTANCE.getLog().log(new Status(Status.INFO, PLUGIN_ID, Status.OK, msg, null));
+ if(isDebugEnabled()) {
+ PluginHolder.INSTANCE.getLog().log(new Status(Status.INFO, PLUGIN_ID, Status.OK, msg, null));
+ }
}
public static void log(IStatus status) {
- if(isDebugEnabled() || !status.isOK()) PluginHolder.INSTANCE.getLog().log(status);
+ if(isDebugEnabled() || !status.isOK()) {
+ PluginHolder.INSTANCE.getLog().log(status);
+ }
}
public static void log(String message, Throwable exception) {
Modified: trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/step/ActionExceptionCheckElement.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/step/ActionExceptionCheckElement.java 2007-09-11 14:26:02 UTC (rev 3557)
+++ trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/step/ActionExceptionCheckElement.java 2007-09-11 14:26:32 UTC (rev 3558)
@@ -25,11 +25,8 @@
String exceptionTypeName = getAttributeValue(xObject, StrutsConstants.ATT_TYPE);
- try {
- condition = new ActionExceptionCondition(actionTypeName, exceptionTypeName);
- } catch(Exception e) {
- StrutsDebugPlugin.log(e);
- }
+ condition = new ActionExceptionCondition(actionTypeName, exceptionTypeName);
+
StrutsDebugPlugin.log("ActionExceptionCheckElement(" + actionTypeName + ", " + exceptionTypeName + ")");
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/step/ActionFormCheckElement.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/step/ActionFormCheckElement.java 2007-09-11 14:26:02 UTC (rev 3557)
+++ trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/step/ActionFormCheckElement.java 2007-09-11 14:26:32 UTC (rev 3558)
@@ -29,11 +29,7 @@
public ActionFormCheckElement(XModelObject xObject) {
super(xObject);
String actionMappingPath = getAttributeValue(xObject, StrutsConstants.ATT_PATH);
- try {
- condition = new ActionFormCondition(actionMappingPath);
- } catch(Exception e) {
- StrutsDebugPlugin.log(e);
- }
+ condition = new ActionFormCondition(actionMappingPath);
}
public ICondition getCondition() {
Modified: trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/step/ActionForwardCheckElement.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/step/ActionForwardCheckElement.java 2007-09-11 14:26:02 UTC (rev 3557)
+++ trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/step/ActionForwardCheckElement.java 2007-09-11 14:26:32 UTC (rev 3558)
@@ -23,11 +23,7 @@
public ActionForwardCheckElement(XModelObject xObject, String actionTypeName) {
super(xObject);
String forwardName = getAttributeValue(xObject, StrutsConstants.ATT_NAME);
- try {
- condition = new ActionForwardCondition(actionTypeName, forwardName);
- } catch(Exception e) {
- StrutsDebugPlugin.log(e);
- }
+ condition = new ActionForwardCondition(actionTypeName, forwardName);
}
public ICondition getCondition() {
Modified: trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/step/GlobalExceptionCheckElement.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/step/GlobalExceptionCheckElement.java 2007-09-11 14:26:02 UTC (rev 3557)
+++ trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/step/GlobalExceptionCheckElement.java 2007-09-11 14:26:32 UTC (rev 3558)
@@ -30,12 +30,7 @@
super(xObject);
String exceptionTypeName = getAttributeValue(xObject, StrutsConstants.ATT_TYPE);
-
- try {
- condition = new GlobalExceptionCondition(exceptionTypeName);
- } catch(Exception e) {
- StrutsDebugPlugin.log(e);
- }
+ condition = new GlobalExceptionCondition(exceptionTypeName);
}
public ICondition getCondition() {
Modified: trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/step/GlobalForwardCheckElement.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/step/GlobalForwardCheckElement.java 2007-09-11 14:26:02 UTC (rev 3557)
+++ trunk/struts/plugins/org.jboss.tools.struts.debug/src/org/jboss/tools/struts/debug/internal/step/GlobalForwardCheckElement.java 2007-09-11 14:26:32 UTC (rev 3558)
@@ -29,11 +29,7 @@
public GlobalForwardCheckElement(XModelObject xObject) {
super(xObject);
String forwardName = getAttributeValue(xObject, StrutsConstants.ATT_NAME);
- try {
- condition = new GlobalForwardCondition(forwardName);
- } catch(Exception e) {
- StrutsDebugPlugin.log(e);
- }
+ condition = new GlobalForwardCondition(forwardName);
}
public ICondition getCondition() {
16 years, 9 months