Author: ayukhovich
Date: 2007-06-27 06:24:38 -0400 (Wed, 27 Jun 2007)
New Revision: 2190
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInput.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/OpenEditorWizard.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/TreeFormPage.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/XMLEditorLauncher.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/FormPlace.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/ModelUIImages.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/ModelUIPlugin.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/AbstractModelActionDelegate.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/AddNatureActionDelegate.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/XMenuInvoker.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/XModelObjectAction.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/file/ModelResourceActionDelegate.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/global/AbstractShowUrlActionDelegate.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/global/ReportProblemActionDelegate.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/AdapterFactory.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/StructuredListAdapter.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/XChildrenTableStructuredAdapter.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/custom/ColoredFontData.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/custom/EclipseClassChooserAdapter.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/DefaultButtonControl.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaAdapter.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaChoicerFieldEditor.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/NoteFieldEditor.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/PropertyEditorFactory.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/TableStructuredFieldEditor.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ControlDragDrop.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ModelTransfer.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/DefaultEditorPart.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/EditorPartWrapper.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/EditorPartWrapperExtension.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DefaultDropCommand.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropUtils.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/PaletteDropCommand.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/PlainTextDropCommand.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/UnknownDropCommand.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagAttributesComposite.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagProposalsComposite.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/AnyElementForm.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Form.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormContainer.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormFactory.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/LayouredFormFactory.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Memento.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/navigator/FilteredTreeContentProvider.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/navigator/TreeViewerModelListenerImpl.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/ExtendedPropertiesWizard.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/PropertiesWizard.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XChildrenEditor.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/outline/XModelObjectContentOutlineProvider.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/problem/ResourceProblemManager.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/reporting/ProblemReporter.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/reporting/ReportProblemWizard.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/resources/ResourceLayoutManager.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/TemplatesConfiguration.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/configuration/MetaConfigurationLoader.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/MultiPageContributor.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/PropertiesTextEditorComponent.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/TextEditorComponent.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/TextEditorSupport.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorComponent.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorStandAlone.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/dnd/TextEditorDrop.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/preferences/EditorsPreferencesPage.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/xmleditor/XMLTextEditor.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/util/ExceptionHandler.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/util/ExtensionPointUtils.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/FilteredTreesCache.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/NavigatorContentProvider.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/NavigatorMenuInvoker.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteAdapter.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteContents.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteInsertHelper.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteInsertManager.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteTaglibInserter.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteViewPart.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/TextAndReferenceComponent.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewClassCreationWizard.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewFileWizard.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewJSPFileWizard.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/NewClassWizard.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/NewTypeWizardAdapter.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/query/AbstractQueryWizardView.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special/DefaultSpecialWizard.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/standard/DefaultStandardStep.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/standard/DefaultStandardWizard.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/util/XModelTreeListenerSWTASync.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/util/XModelTreeListenerSWTSync.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesCompoundEditor.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/text/PropertyTextEditorSupport.java
Log:
Correction of many loggers to one logger
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInput.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInput.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInput.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -150,7 +150,7 @@
field.setAccessible(true);
field.set(this, f);
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
@@ -186,7 +186,7 @@
o = EclipseResourceUtil.createObjectForResource(f);
if(o != null && o.getFileType() != XModelObject.FILE) o = null;
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
return (o == null) ? input : new XModelObjectEditorInput(getMainObject(o));
@@ -198,7 +198,7 @@
o = EclipseResourceUtil.createObjectForLocation(input.getPath(input).toString());
if(o != null && o.getFileType() != XModelObject.FILE) o = null;
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
return (o == null) ? (IEditorInput)input : new
ModelObjectLocationEditorInput(getMainObject(o), input.getPath(input));
}
@@ -263,7 +263,7 @@
field.setAccessible(true);
field.set(this, f);
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -268,7 +268,7 @@
textEditor.addFocusListener(new TextFocusListener());
outline.addSelectionChangedListener(new OutlineSelectionListener());
} catch (Exception ex) {
- ModelUIPlugin.log(ex);
+ ModelUIPlugin.getPluginLog().logError(ex);
}
}
@@ -365,7 +365,7 @@
m.setAccessible(true);
m.invoke(textEditor, new Object[]{Boolean.TRUE, monitor});
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
@@ -482,7 +482,7 @@
update0();
}
} catch (Exception t) {
- ModelUIPlugin.log("Error in updating editor", t);
+ ModelUIPlugin.getPluginLog().logError("Error in updating editor", t);
}
lock2 = false;
}
@@ -845,7 +845,7 @@
//Activate key binding service here
formPage.getEditorSite().getKeyBindingService();
} catch (Exception ex) {
- ModelUIPlugin.log(ex);
+ ModelUIPlugin.getPluginLog().logError(ex);
}
//getSite().setSelectionProvider(formPage.getSelectionProvider());
}
@@ -1060,7 +1060,7 @@
try {
((AbstractTextEditor)e.textEditor).setInput(e2);
} catch (Exception exc) {
- ModelUIPlugin.log(exc);
+ ModelUIPlugin.getPluginLog().logError(exc);
}
((XModelObjectEditorInput)ei).synchronize();
if(((XModelObjectEditorInput)ei).getXModelObject() != o) {
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/OpenEditorWizard.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/OpenEditorWizard.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/OpenEditorWizard.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -51,7 +51,7 @@
try {
f.getParent().refreshLocal(IResource.DEPTH_INFINITE, null);
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
if(!f.exists()) {
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/TreeFormPage.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/TreeFormPage.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/TreeFormPage.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -213,7 +213,7 @@
rightFormContainer.clear();
} catch (Exception e) {
if(ModelUIPlugin.isDebugEnabled()) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
@@ -241,7 +241,7 @@
Constructor c = cls.getConstructor(new Class[]{XModelObject.class});
formFactory = (XModelObjectFormFactory)c.newInstance(new Object[]{selected});
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
return new FormFactory(selected);
}
} else {
@@ -448,7 +448,7 @@
public void doOperation(int operation) {
if (operation>actionMapping.size()) {
- ModelUIPlugin.log(new RuntimeException("Can not find global action with index:
"+operation));
+ ModelUIPlugin.getPluginLog().logError(new RuntimeException("Can not find global
action with index: "+operation));
} else {
String globalAction = (String)actionMapping.get(operation);
this.doGlobalAction(globalAction);
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/XMLEditorLauncher.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/XMLEditorLauncher.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/XMLEditorLauncher.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -19,7 +19,6 @@
import org.jboss.tools.common.core.resources.XModelObjectEditorInput;
import org.jboss.tools.common.model.XModelObject;
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.ui.editor.*;
@@ -70,8 +69,7 @@
try {
workbenchPage.openEditor(input, id);
} catch (Exception e) {
- ProblemReportingHelper.reportProblem(ModelUIPlugin.PLUGIN_ID, e);
- if(e instanceof Exception) ModelUIPlugin.log((Exception)e);
+ ModelUIPlugin.getPluginLog().logError((Exception)e);
}
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/FormPlace.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/FormPlace.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/FormPlace.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -59,7 +59,7 @@
try {
form = (IForm)cls.newInstance();
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
return;
}
form.setInput(selected);
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/ModelUIImages.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/ModelUIImages.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/ModelUIImages.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -47,20 +47,20 @@
INSTANCE = new ModelUIImages(new
URL(ModelUIPlugin.getDefault().getBundle().getEntry("/"),
"images/xstudio/"));
} catch (MalformedURLException e) {
// do nothing
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
public static Image getImage(String key) {
if(ModelUIPlugin.isDebugEnabled()) {
- ModelUIPlugin.log("Create image for key '"+key+"'.");
+ ModelUIPlugin.getPluginLog().logInfo("Create image for key
'"+key+"'.");
}
return INSTANCE.createImageDescriptor(key).createImage();
}
public static ImageDescriptor getImageDescriptor(String key) {
if(ModelUIPlugin.isDebugEnabled()) {
- ModelUIPlugin.log("Create image descriptor for key
'"+key+"'.");
+ ModelUIPlugin.getPluginLog().logInfo("Create image descriptor for key
'"+key+"'.");
}
return INSTANCE.createImageDescriptor(key);
}
@@ -80,9 +80,9 @@
protected ModelUIImages(URL registryUrl, ModelUIImages parent){
if(ModelUIPlugin.isDebugEnabled()) {
- ModelUIPlugin.log("Create ModelUIImages class.");
- ModelUIPlugin.log("RegistryUrl = " + registryUrl);
- ModelUIPlugin.log("parent = " +
(parent==null?"null":parent.getClass().getName()));
+ ModelUIPlugin.getPluginLog().logInfo("Create ModelUIImages class.");
+ ModelUIPlugin.getPluginLog().logInfo("RegistryUrl = " + registryUrl);
+ ModelUIPlugin.getPluginLog().logInfo("parent = " +
(parent==null?"null":parent.getClass().getName()));
}
if(registryUrl == null) throw new NullPointerException("Base url for image
registry cannot be null.");
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/ModelUIPlugin.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/ModelUIPlugin.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/ModelUIPlugin.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -12,6 +12,7 @@
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IStatus;
@@ -23,16 +24,13 @@
import org.eclipse.jdt.ui.PreferenceConstants;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.templates.TemplateContextType;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
+import org.jboss.tools.common.log.BaseUIPlugin;
+import org.jboss.tools.common.log.IPluginLog;
import org.jboss.tools.common.model.plugin.IModelPlugin;
-import org.jboss.tools.common.reporting.ProblemReporterFactory;
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
-import org.jboss.tools.common.model.ui.reporting.ProblemReporter;
import org.jboss.tools.common.model.ui.templates.RedHatTemplateContextType;
+import org.osgi.framework.BundleContext;
-public class ModelUIPlugin extends AbstractUIPlugin implements IModelPlugin {
+public class ModelUIPlugin extends BaseUIPlugin implements IModelPlugin {
public static final String PLUGIN_ID = "org.jboss.tools.common.model.ui";
private static ModelUIPlugin INSTANCE;
private ResourceBundle resourceBundle;
@@ -87,21 +85,6 @@
return INSTANCE.isDebugging();
}
- public static void log(String msg) {
- if(isDebugEnabled()) INSTANCE.getLog().log(new Status(Status.INFO, PLUGIN_ID,
Status.OK, msg, null));
- }
-
- public static void log(IStatus status) {
- if(isDebugEnabled() || !status.isOK()) INSTANCE.getLog().log(status);
- }
-
- public static void log(String message, Throwable exception) {
- INSTANCE.getLog().log(new Status(Status.ERROR, PLUGIN_ID, Status.OK, message,
exception));
- }
-
- public static void log(Exception ex) {
- INSTANCE.getLog().log(new Status(Status.ERROR, PLUGIN_ID, Status.OK, "No
message", ex));
- }
public static final String PROJECT_OVERRIDE =
"org.jboss.tools.common.model.ui.templates.projectOverriveTemplates";
public static final String PROJECT_CAN_OVERRIDE =
"org.jboss.tools.common.model.ui.templates.projectCanOverriveTemplates";
@@ -113,16 +96,14 @@
super.initializeDefaultPreferences(store);
}
- public static void log(String s, boolean isError) {
- if (isError) {
- log(new Status(IStatus.ERROR, getPluginId(), IJavaStatusConstants.INTERNAL_ERROR, s,
null));
- } else {
- log(new Status(IStatus.INFO, getPluginId(), IJavaStatusConstants.INTERNAL_ERROR, s,
null));
- }
- }
-
public static String getPluginId() {
return ModelUIPlugin.ID_PLUGIN;
}
-
+
+ /**
+ * @return IPluginLog object
+ */
+ public static IPluginLog getPluginLog() {
+ return getDefault();
+ }
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/AbstractModelActionDelegate.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/AbstractModelActionDelegate.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/AbstractModelActionDelegate.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -62,7 +62,7 @@
try {
doRun();
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/AddNatureActionDelegate.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/AddNatureActionDelegate.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/AddNatureActionDelegate.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -26,7 +26,6 @@
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.ui.actions.RefreshAction;
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
public abstract class AddNatureActionDelegate implements IObjectActionDelegate,
IWorkbenchWindowActionDelegate {
@@ -47,7 +46,7 @@
try {
doRun();
} catch(Exception ex) {
- ProblemReportingHelper.reportProblem(ModelUIPlugin.PLUGIN_ID, ex);
+ ModelUIPlugin.getPluginLog().logError(ex);
}
}
@@ -83,7 +82,7 @@
project = null;
} catch (Exception ex) {
project = null;
- ModelUIPlugin.log(ex);
+ ModelUIPlugin.getPluginLog().logError(ex);
}
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/XMenuInvoker.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/XMenuInvoker.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/XMenuInvoker.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -122,7 +122,7 @@
XActionInvoker.invoke(actionPath, object, objects, getRunningProperties());
}
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/XModelObjectAction.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/XModelObjectAction.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/XModelObjectAction.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -26,7 +26,6 @@
import org.jboss.tools.common.meta.action.XRedirect;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.event.ActionDeclinedException;
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
public class XModelObjectAction extends XModelObjectActionItem {
@@ -98,7 +97,7 @@
}
} catch (ActionDeclinedException de) {
} catch(Exception e) {
- ProblemReportingHelper.reportProblem(ModelUIPlugin.PLUGIN_ID, e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/file/ModelResourceActionDelegate.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/file/ModelResourceActionDelegate.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/file/ModelResourceActionDelegate.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -191,7 +191,7 @@
try {
if(project.hasNature(s[i])) return true;
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
return false;
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/global/AbstractShowUrlActionDelegate.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/global/AbstractShowUrlActionDelegate.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/global/AbstractShowUrlActionDelegate.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -21,7 +21,6 @@
import org.jboss.tools.common.model.ServiceDialog;
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
public abstract class AbstractShowUrlActionDelegate implements
IWorkbenchWindowActionDelegate {
@@ -35,7 +34,7 @@
try {
runURL(getUrl());
} catch (Exception e) {
- ProblemReportingHelper.reportProblem(ModelUIPlugin.PLUGIN_ID, e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
@@ -56,7 +55,7 @@
ServiceDialog d = PreferenceModelUtilities.getPreferenceModel().getService();
d.showDialog("Error", "Incorrect URL: " + mue.getMessage() +
".", new String[]{"OK"}, null, ServiceDialog.ERROR);
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/global/ReportProblemActionDelegate.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/global/ReportProblemActionDelegate.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/global/ReportProblemActionDelegate.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -20,7 +20,7 @@
import org.eclipse.ui.IWorkbenchWindowActionDelegate;
import org.jboss.tools.common.model.util.ClassLoaderUtil;
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
+import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.ui.reporting.ReportProblemWizard;
public class ReportProblemActionDelegate implements IWorkbenchWindowActionDelegate {
@@ -40,9 +40,7 @@
wizard.setObject(p);
wizard.execute();
} catch (Exception t) {
- String message = "Report Problems Wizard failed.";
- IStatus status = new Status(IStatus.ERROR,
"org.jboss.tools.common.model.ui", 0, message, t);
- ProblemReportingHelper.reportProblem(status);
+ ModelUIPlugin.getPluginLog().logError( "Report Problems Wizard failed.",
t);
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/AdapterFactory.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/AdapterFactory.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/AdapterFactory.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -64,7 +64,7 @@
c = ExtensionPointUtil.findClassByElementId(ATTRIBUTE_ADAPTER_EXT_POINT,
id).getClass();
} catch (Exception e) {
if(ModelUIPlugin.getDefault().isDebugging()) {
- ModelUIPlugin.log("Default adapter for " + id);
+ ModelUIPlugin.getPluginLog().logInfo("Default adapter for " + id);
}
c = DefaultValueAdapter.class;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/StructuredListAdapter.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/StructuredListAdapter.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/StructuredListAdapter.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -66,7 +66,7 @@
try {
newValueProvider =
(INewValueProvider)ModelFeatureFactory.getInstance().createFeatureInstance(newValueClassName);
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/XChildrenTableStructuredAdapter.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/XChildrenTableStructuredAdapter.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/XChildrenTableStructuredAdapter.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -542,14 +542,14 @@
try {
XActionInvoker.invoke(COPY_XACTION_PATH, this.xmo, null, new Properties());
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
XModelObject prev = list[targetIndex];
try {
XActionInvoker.invoke(MOVE_XACTION_PATH, prev, null, new Properties());
if(table != null && !table.isDisposed()) table.setSelection(targetIndex);
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
fireStructureChange();
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/custom/ColoredFontData.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/custom/ColoredFontData.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/custom/ColoredFontData.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -24,7 +24,7 @@
DEFAULT.data = Display.getDefault().getSystemFont().getFontData()[0];
DEFAULT.color = Display.getDefault().getSystemColor(SWT.COLOR_BLACK).getRGB();
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/custom/EclipseClassChooserAdapter.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/custom/EclipseClassChooserAdapter.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/custom/EclipseClassChooserAdapter.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -53,7 +53,7 @@
return type.getFullyQualifiedName();
}
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
return null;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/DefaultButtonControl.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/DefaultButtonControl.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/DefaultButtonControl.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -106,7 +106,7 @@
createButton(composite, buttonWrapper);
} else {
if(ModelUIPlugin.getDefault().isDebugging()) {
- ModelUIPlugin.log("No button for action: "+object);
+ ModelUIPlugin.getPluginLog().logInfo("No button for action: "+object);
}
}
}
@@ -207,7 +207,7 @@
protected void doButtonPressed(Button control, String action) {
if(ModelUIPlugin.getDefault().isDebugging()) {
- ModelUIPlugin.log("Button pressed: "+action);
+ ModelUIPlugin.getPluginLog().logInfo("Button pressed: "+action);
}
firePropertyChange(new PropertyChangeEvent(control, action, null, Boolean.TRUE));
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaAdapter.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaAdapter.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaAdapter.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -52,7 +52,7 @@
try {
javaProject = (IJavaProject)project.getNature(JavaCore.NATURE_ID);
} catch (CoreException e) {
- ModelUIPlugin.log("Cannot find Java Project Nature.", new Exception());
+ ModelUIPlugin.getPluginLog().logError("Cannot find Java Project
Nature.", new Exception());
return null;
}
IResource r = EclipseResourceUtil.getJavaSourceRoot(project);
@@ -82,7 +82,7 @@
try {
javaProject = (IJavaProject)project.getNature(JavaCore.NATURE_ID);
} catch (CoreException e) {
- ModelUIPlugin.log("Cannot find Java Project Nature.", new Exception());
+ ModelUIPlugin.getPluginLog().logError("Cannot find Java Project
Nature.", new Exception());
return;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaChoicerFieldEditor.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaChoicerFieldEditor.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaChoicerFieldEditor.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -227,7 +227,7 @@
try {
text.setSelection(newValue.length());
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
PropertyChangeEvent event = new PropertyChangeEvent(this, IPropertyEditor.VALUE,
oldValue, newValue);
@@ -533,7 +533,7 @@
if(o != null) o.setObject(((DefaultValueAdapter)adapter).getModelObject());
return o;
} catch (Exception e) {
- ModelPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
return null;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -155,7 +155,7 @@
try {
JavaUI.openInEditor(javaElement);
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
@@ -249,7 +249,7 @@
if(o != null) o.setObject(((DefaultValueAdapter)adapter).getModelObject());
return o;
} catch (Exception e) {
- ModelPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
return null;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/NoteFieldEditor.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/NoteFieldEditor.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/NoteFieldEditor.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -207,7 +207,7 @@
try {
font = new Font(null, data);
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/PropertyEditorFactory.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/PropertyEditorFactory.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/PropertyEditorFactory.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -58,7 +58,7 @@
propertyEditor = (PropertyEditor)getEditorClass(attribute).newInstance();
propertyEditor.setSettings(settings);
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
propertyEditor = new StringEditor(settings);
}
String labelText = WizardKeys.getAttributeDisplayName(attribute, true);
@@ -84,7 +84,7 @@
} catch (Exception e) {
if(!defaultEditorIds.contains(id)) {
defaultEditorIds.add(id);
- ModelUIPlugin.log("PropertyEditorFactory: Default editor used for " + id);
+ ModelUIPlugin.getPluginLog().logInfo("PropertyEditorFactory: Default editor used
for " + id);
}
c = StringEditor.class;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/TableStructuredFieldEditor.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/TableStructuredFieldEditor.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/TableStructuredFieldEditor.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -253,7 +253,7 @@
try {
structureChanged(null);
} catch (Exception e ) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ControlDragDrop.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ControlDragDrop.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ControlDragDrop.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -25,7 +25,6 @@
import org.jboss.tools.common.model.util.ModelFeatureFactory;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.XModelTransferBuffer;
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
public class ControlDragDrop {
@@ -35,7 +34,7 @@
try {
paletteAdopt =
(XAdoptManager)ModelFeatureFactory.getInstance().createFeatureInstance("org.jboss.tools.jst.web.tld.model.handlers.JSPAdopt");
} catch (Exception e) {
- ModelPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
@@ -331,7 +330,7 @@
}
} catch (ActionDeclinedException de) {
} catch (Exception e) {
- exception(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
}
@@ -372,12 +371,8 @@
}
}
} catch (Exception ex) {
- ModelUIPlugin.log("Error while looking for tree item at given point", ex);
+ ModelUIPlugin.getPluginLog().logError("Error while looking for tree item at given
point", ex);
}
return null;
}
- public void exception(Exception e) {
- ProblemReportingHelper.reportProblem(ModelUIPlugin.PLUGIN_ID, e);
- }
-
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ModelTransfer.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ModelTransfer.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ModelTransfer.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -49,7 +49,7 @@
dataOut.close();
super.javaToNative(out.toByteArray(), transferData);
} catch (IOException e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
protected Object nativeToJava(TransferData transferData) {
@@ -67,7 +67,7 @@
String data = dataIn.readUTF();
return data;
} catch (IOException e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
//can't get here
return null;
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/DefaultEditorPart.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/DefaultEditorPart.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/DefaultEditorPart.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -168,7 +168,7 @@
public void doOperation(int operation) {
if (operation>actionMapping.size()) {
- ModelUIPlugin.log(new RuntimeException("Can not find global action with index:
"+operation));
+ ModelUIPlugin.getPluginLog().logError(new RuntimeException("Can not find global
action with index: "+operation));
} else {
String globalAction = (String)actionMapping.get(operation);
this.doGlobalAction(globalAction);
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/EditorPartWrapper.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/EditorPartWrapper.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/EditorPartWrapper.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -67,7 +67,7 @@
try {
((WorkbenchPart)editor).setInitializationData(f.getConfigurationElement(),
"", null);
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
editor.init(site, input);
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/EditorPartWrapperExtension.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/EditorPartWrapperExtension.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/EditorPartWrapperExtension.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -14,7 +14,7 @@
import org.eclipse.core.runtime.*;
import org.eclipse.ui.part.EditorActionBarContributor;
import org.osgi.framework.Bundle;
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
+import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
public class EditorPartWrapperExtension {
@@ -51,15 +51,14 @@
priority = Integer.parseInt(priorityString);
}
} catch (Exception e) {
- ModelUIPlugin.log("Incorrect priority value " + priorityString +
".");
+ ModelUIPlugin.getPluginLog().logError("Incorrect priority value " +
priorityString + ".");
}
Class editorClass = null;
try {
editorClass = bundle.loadClass(editor);
} catch (Exception e) {
if(ModelUIPlugin.getDefault().isDebugging()) {
- String message = "Cannot load editor class " + editor + " from
" + es[i].getNamespaceIdentifier();
- ProblemReportingHelper.reportProblem("org.jboss.tools.common.model.ui",
message, e);
+ ModelUIPlugin.getPluginLog().logError("Cannot load editor class " +
editor + " from " + es[i].getNamespaceIdentifier(), e);
}
continue;
}
@@ -70,7 +69,7 @@
} catch (Exception e) {
if(ModelUIPlugin.getDefault().isDebugging()) {
String message = "Cannot load contributor class " + contributor;
- ProblemReportingHelper.reportProblem("org.jboss.tools.common.model.ui",
message, e);
+ ModelUIPlugin.getPluginLog().logError( message, e);
}
contributorClass = EditorActionBarContributor.class;
////continue;
@@ -80,11 +79,11 @@
f = new EditorPartFactory(cs[j], editorClass, contributorClass);
} catch (ClassCastException e) {
if(ModelUIPlugin.getDefault().isDebugging()) {
- ProblemReportingHelper.reportProblem("org.jboss.tools.common.model.ui",
e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
continue;
} catch (Exception e) {
- ProblemReportingHelper.reportProblem("org.jboss.tools.common.model.ui",
e);
+ ModelUIPlugin.getPluginLog().logError(e);
continue;
}
StringTokenizer st = new StringTokenizer(entities, ",;");
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DefaultDropCommand.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DefaultDropCommand.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DefaultDropCommand.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -17,7 +17,7 @@
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.widgets.Display;
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
+import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.ui.editors.dnd.composite.TagProposalsComposite;
/**
@@ -111,7 +111,7 @@
workspace.run(this,new NullProgressMonitor());
} catch (CoreException e) {
// VpePlugin.reportProblem(e);
- ProblemReportingHelper.reportProblem("org.jboss.tools.common.model.ui.views",
e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
} else {
executeUnknownTag();
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropUtils.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropUtils.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropUtils.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -29,7 +29,6 @@
import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl;
import org.jboss.tools.common.model.project.IModelNature;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
import org.jboss.tools.common.kb.AttributeDescriptor;
import org.jboss.tools.common.kb.KbConnectorFactory;
import org.jboss.tools.common.kb.KbConnectorType;
@@ -82,7 +81,7 @@
}
} catch (Exception ex) {
// VpePlugin.reportProblem(ex);
- ProblemReportingHelper.reportProblem("org.jboss.tools.common.model.ui.views",
ex);
+ ModelUIPlugin.getPluginLog().logError(ex);
// empty TLD content will be set
}
return tldContent;
@@ -124,7 +123,7 @@
}
} catch (Exception ex) {
// VpePlugin.reportProblem(ex);
- ProblemReportingHelper.reportProblem("org.jboss.tools.common.model.ui.views",
ex);
+ ModelUIPlugin.getPluginLog().logError(ex);
// empty array will be returned
}
if(attributes==null)return new AttributeDescriptorValue[0];
@@ -154,7 +153,7 @@
wtpKbConnector.registerResource(new KbTldResource(uri, "", tagPrefix,
version), true);
tagInfo =
wtpKbConnector.getTagInformation("/"+(tagPrefix==TagProposal.EMPTY_PREFIX?"":tagPrefix+":")+tagName);
} catch (Exception ex) {
- ModelUIPlugin.log(ex);
+ ModelUIPlugin.getPluginLog().logError(ex);
}
return tagInfo;
}
@@ -170,7 +169,7 @@
newUrl = new URL(dropData.getMimeData());
} catch (MalformedURLException e) {
// VpePlugin.reportProblem(e);
- ProblemReportingHelper.reportProblem("org.jboss.tools.common.model.ui.views",
e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
IFile file = EclipseResourceUtil.getFile(newUrl.getPath());
if(file != null && file.exists()) return file;
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/PaletteDropCommand.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/PaletteDropCommand.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/PaletteDropCommand.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -30,7 +30,6 @@
import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper;
import org.jboss.tools.common.model.ui.views.palette.PaletteInsertManager;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
import org.jboss.tools.jst.web.tld.IWebProject;
import org.jboss.tools.jst.web.tld.TLDToPaletteHelper;
import org.jboss.tools.jst.web.tld.URIConstants;
@@ -66,7 +65,7 @@
if(addTaglib == null) addTaglib = "true";
runningProperties.setProperty(PaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, addTaglib);
} catch (Exception e){
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
@@ -104,7 +103,7 @@
document.replace(containerOffset+slashPosition,
containerString.length()-slashPosition, text);
}
}catch(Exception ex){
- ProblemReportingHelper.reportProblem("org.jboss.tools.common.model.ui.views",
ex);
+ ModelUIPlugin.getPluginLog().logError(ex);
}
}
}
@@ -174,7 +173,7 @@
}
}
} catch (Exception e) {
- ProblemReportingHelper.reportProblem("org.jboss.tools.common.model.ui.views",
e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
startText = properties.getProperty(TLDToPaletteHelper.START_TEXT);
endText = properties.getProperty(TLDToPaletteHelper.END_TEXT);
@@ -306,7 +305,7 @@
try {
wizard =
(IDropWizard)PaletteInsertManager.getInstance().createWizardInstance(properties);
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
if(wizard == null) wizard = new DropWizard();
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/PlainTextDropCommand.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/PlainTextDropCommand.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/PlainTextDropCommand.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -17,8 +17,8 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper;
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
public class PlainTextDropCommand extends DefaultDropCommand {
@@ -45,8 +45,7 @@
try {
workspace.run(this,new NullProgressMonitor());
} catch (CoreException e) {
-// VpePlugin.reportProblem(e);
- ProblemReportingHelper.reportProblem("org.jboss.tools.common.model.ui.views",
e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
}
\ No newline at end of file
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/UnknownDropCommand.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/UnknownDropCommand.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/UnknownDropCommand.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -17,8 +17,8 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper;
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
public class UnknownDropCommand extends DefaultDropCommand {
@@ -46,7 +46,7 @@
try {
workspace.run(this,new NullProgressMonitor());
} catch (CoreException e) {
- ProblemReportingHelper.reportProblem("org.jboss.tools.common.model.ui.views",
e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
}
\ No newline at end of file
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagAttributesComposite.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagAttributesComposite.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagAttributesComposite.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -15,6 +15,7 @@
import java.util.*;
import java.util.List;
+import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.ui.objecteditor.ExtendedCellEditorProvider;
import org.eclipse.jface.viewers.*;
import org.eclipse.swt.SWT;
@@ -25,7 +26,6 @@
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.*;
import org.jboss.tools.common.model.util.ModelFeatureFactory;
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
import org.jboss.tools.common.kb.AttributeDescriptor;
import org.jboss.tools.common.kb.AttributeValueDescriptor;
import org.jboss.tools.common.model.ui.editors.dnd.IDropWizardModel;
@@ -349,7 +349,7 @@
return
(ExtendedCellEditorProvider)ModelFeatureFactory.getInstance().createFeatureInstance("org.jboss.tools.jst.jsp.outline.JSPCellEditorProviderImpl");
} catch (Exception e) {
// VpePlugin.reportProblem(e);
- ProblemReportingHelper.reportProblem("org.jboss.tools.common.model.ui.views",
e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
return null;
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagProposalsComposite.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagProposalsComposite.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagProposalsComposite.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -27,7 +27,7 @@
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
+import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.ui.editors.dnd.*;
public class TagProposalsComposite extends Composite {
@@ -103,7 +103,7 @@
fModel.setTagProposal(selection);
} catch (Exception e) {
// VpePlugin.reportProblem(e);
- ProblemReportingHelper.reportProblem("org.jboss.tools.common.model.ui.views",
e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/AnyElementForm.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/AnyElementForm.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/AnyElementForm.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -128,8 +128,7 @@
String heading = "Attributes";
this.setHeadingText(heading);
if(!(model instanceof XModelObject)) {
- Status s = new Status(Status.OK, ModelUIPlugin.PLUGIN_ID, Status.OK, "Error to
create form " + heading + ". Model object cannot be null.", new
Exception());
- ModelUIPlugin.log(s);
+ ModelUIPlugin.getPluginLog().logInfo( "Error to create form " + heading +
". Model object cannot be null.", new Exception());
return;
}
this.xmo = (XModelObject)model;
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Form.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Form.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Form.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -136,7 +136,7 @@
support.registerFieldEditor(editor.getAttributeName(),
(ExtendedFieldEditor)wraper);
}
catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
} else {
ExtendedFieldEditor fieldEditor =
(ExtendedFieldEditor)((IFieldEditor)editor.getFieldEditor(composite));
@@ -148,8 +148,7 @@
support.registerFieldEditor(editor.getAttributeName(),
(ExtendedFieldEditor)fieldEditor);
}
} else {
- Status status = new Status(Status.OK, ModelUIPlugin.PLUGIN_ID, Status.OK,
ModelUIMessages.getString(CANNOT_LOAD_ATTRIBUTE, new String[] {attributes[i].getName()}),
new Exception(ModelUIMessages.getString(CANNOT_LOAD_ATTRIBUTE, new String[]
{attributes[i].getName()})));
- ModelUIPlugin.log(status);
+ ModelUIPlugin.getPluginLog().logInfo(
ModelUIMessages.getString(CANNOT_LOAD_ATTRIBUTE, new String[] {attributes[i].getName()}),
new Exception(ModelUIMessages.getString(CANNOT_LOAD_ATTRIBUTE, new String[]
{attributes[i].getName()})));
}
}
} else {
@@ -171,8 +170,7 @@
public void initialize(Object model) {
this.xmo = (XModelObject)model;
if(xmo == null) {
- Status s = new Status(Status.OK, ModelUIPlugin.PLUGIN_ID, Status.OK, "Error to
create form "+formData.getHeader()+". Model object cannot be null.", new
Exception());
- ModelUIPlugin.log(s);
+ ModelUIPlugin.getPluginLog().logInfo( "Error to create form
"+formData.getHeader()+". Model object cannot be null.", new Exception());
return;
}
this.model = xmo.getModel();
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormContainer.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormContainer.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormContainer.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -12,7 +12,6 @@
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.ModelFeatureFactory;
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.ui.forms.DefaultFormContainer;
import org.jboss.tools.common.model.ui.forms.IForm;
@@ -41,7 +40,7 @@
try {
form =
(IForm)ModelFeatureFactory.getInstance().createFeatureInstance(forms[i].getFormClassName());
} catch(Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
if(form!=null) {
@@ -68,7 +67,7 @@
if(child == null) {
String message = "Cannot build child form '" +
forms[i].getEntityName() + "' for form '" + formData.getEntityName() +
"'.";
Exception exc = new RuntimeException(message);
- ProblemReportingHelper.reportProblem("org.jboss.tools.common.model.ui",
exc);
+ ModelUIPlugin.getPluginLog().logError(exc);
} else {
this.get(i).initialize(child);
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormFactory.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormFactory.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormFactory.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -43,7 +43,7 @@
try {
form = (IForm)formClass.newInstance();
} catch(Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
return form;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/LayouredFormFactory.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/LayouredFormFactory.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/LayouredFormFactory.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -12,7 +12,6 @@
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.ModelFeatureFactory;
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.ui.forms.IForm;
@@ -36,7 +35,7 @@
try {
formLayoutData =
(IFormLayoutData)formLayoutDataClass.getMethod("getInstance",
(Class[])null).invoke(null, (Object[])null);
} catch(Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
@@ -49,7 +48,7 @@
IFormData formData = formLayoutData.getFormData(entity);
if(formData == null) {
String message = "Cannot find form for entity " + entity + ".";
- ProblemReportingHelper.reportProblem("org.jboss.tools.common.model.ui", new
Exception(message));
+ ModelUIPlugin.getPluginLog().logError(new Exception(message));
} else if(formData.getForms() != null) {
form = new FormContainer(formData);
} else {
@@ -57,7 +56,7 @@
}
} catch(Exception e) {
String message = "Cannot build form.";
- ProblemReportingHelper.reportProblem("org.jboss.tools.common.model.ui",
message, e);
+ ModelUIPlugin.getPluginLog().logError( message, e);
}
return form;
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Memento.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Memento.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Memento.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -42,7 +42,7 @@
private Memento() {}
public Memento(String id) {
- ModelUIPlugin.log("new Memento("+id+")");
+ ModelUIPlugin.getPluginLog().logInfo("new Memento("+id+")");
this.id = id;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/navigator/FilteredTreeContentProvider.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/navigator/FilteredTreeContentProvider.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/navigator/FilteredTreeContentProvider.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -43,7 +43,7 @@
result =
(XFilteredTree)getClass().getClassLoader().loadClass(classname).newInstance();
result.setModel(model);
} catch(Exception ex) {
- ModelUIPlugin.log(ex);
+ ModelUIPlugin.getPluginLog().logError(ex);
}
}
return result;
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/navigator/TreeViewerModelListenerImpl.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/navigator/TreeViewerModelListenerImpl.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/navigator/TreeViewerModelListenerImpl.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -13,9 +13,9 @@
import org.eclipse.swt.widgets.*;
import org.eclipse.jface.viewers.*;
import org.jboss.tools.common.model.*;
+import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.util.*;
import org.jboss.tools.common.model.event.*;
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
public class TreeViewerModelListenerImpl implements XModelTreeListener {
protected TreeViewer viewer;
@@ -77,7 +77,7 @@
if(reportRefreshProblemCount == 0) {
reportRefreshProblemCount = 1;
String message = "Cannot refresh tree for " +
refreshObject.getPresentationString();
- ProblemReportingHelper.reportProblem("org.jboss.tools.common.model.ui",
message, e);
+ ModelUIPlugin.getPluginLog().logError( message, e);
}
return;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/ExtendedPropertiesWizard.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/ExtendedPropertiesWizard.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/ExtendedPropertiesWizard.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -60,7 +60,7 @@
String nodeName = attributes.getNodeName();
setTitle((nodeName != null) ? "<" + nodeName + ">" :
"");
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/PropertiesWizard.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/PropertiesWizard.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/PropertiesWizard.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -57,7 +57,7 @@
boolean viewMode = p != null &&
"true".equals(p.getProperty("viewMode"));
objectEditor.setViewMode(viewMode);
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XChildrenEditor.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XChildrenEditor.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XChildrenEditor.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -273,7 +273,7 @@
p.put("insertAfter", new Integer(i));
XActionInvoker.invoke(path, o, getTargets(), p);
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/outline/XModelObjectContentOutlineProvider.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/outline/XModelObjectContentOutlineProvider.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/outline/XModelObjectContentOutlineProvider.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -56,7 +56,7 @@
try {
getSite().getWorkbenchWindow().getSelectionService().removePostSelectionListener(getSelectionListener());
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/problem/ResourceProblemManager.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/problem/ResourceProblemManager.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/problem/ResourceProblemManager.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -41,7 +41,7 @@
try {
ms = resource.findMarkers(null, true, IResource.DEPTH_INFINITE);
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
for (int i = 0; i < ms.length; i++) {
Problem p = getProblem(ms[i]);
@@ -64,7 +64,7 @@
m.setAttribute(IMarker.CHAR_START, pos_i);
m.setAttribute(IMarker.CHAR_END, pos_i + 1);
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
} else {
@@ -76,7 +76,7 @@
try {
ms[i].delete();
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
}
@@ -112,7 +112,7 @@
try {
MarkerUtilities.createMarker(resource, markerData, IMarker.PROBLEM);
} catch (CoreException e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/reporting/ProblemReporter.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/reporting/ProblemReporter.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/reporting/ProblemReporter.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -14,6 +14,7 @@
import java.io.IOException;
import java.io.PrintStream;
import org.eclipse.core.runtime.IStatus;
+import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.ui.dialog.ErrorDialog;
import org.eclipse.swt.SWTError;
import org.eclipse.swt.SWTException;
@@ -29,14 +30,23 @@
static int REPORT_ACTION = 2;
public void reportProblem(IStatus status) {
- R runnable = new R(status);
+
+ //R runnable = new R(status);
+ /*
if(isShowProblemDialogOn() && Display.getDefault()!=null) {
Display.getDefault().syncExec(runnable);
- } else {
+ }
+ else {
runnable.run();
}
+ */
+ if(isShowProblemDialogOn() && Display.getDefault()!=null) {
+ showProblemDialog(status);
+ }
}
+ /**
+ *
class R implements Runnable {
IStatus status;
R(IStatus status) {
@@ -58,6 +68,7 @@
}
}
}
+ */
private boolean isShowProblemDialogOn() {
return "yes".equals(ReportPreference.SHOW_ERROR_DIALOG_OPTION.getValue());
@@ -73,7 +84,7 @@
shell =
ModelPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell();
} catch (Exception e) {
//we cannot call reporting service here!
- ModelPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
return ErrorDialog.openError(shell, "Error", status.getMessage(),
status.getException());
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/reporting/ReportProblemWizard.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/reporting/ReportProblemWizard.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/reporting/ReportProblemWizard.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -7,16 +7,28 @@
*
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.tools.common.model.ui.reporting;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
import java.util.StringTokenizer;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
import org.jboss.tools.common.model.ui.attribute.XAttributeSupport;
import org.jboss.tools.common.model.ui.attribute.adapter.IModelPropertyEditorAdapter;
import org.jboss.tools.common.model.ui.wizards.query.*;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -34,9 +46,10 @@
import org.jboss.tools.common.model.ui.ModelUIImages;
import org.jboss.tools.common.model.ui.widgets.ReferenceListener;
import org.jboss.tools.common.model.ui.widgets.TextAndReferenceComponent;
+import org.osgi.framework.Bundle;
public class ReportProblemWizard extends AbstractQueryWizard {
-
+
public ReportProblemWizard() {
setView(new ReportProblemWizardView());
}
@@ -44,28 +57,35 @@
}
class ReportProblemWizardView extends AbstractQueryWizardView {
+
+ SimpleDateFormat dtf = new SimpleDateFormat("dd_MMM_yyyy__HH_mm_ss_SSS");
+
int stackTracesCount;
Text problemDescription;
XAttributeSupport sendSupport;
XAttributeSupport infoSupport;
- XModelObject reportOptions =
PreferenceModelUtilities.getPreferenceModel().getByPath(ReportPreference.OPTIONS_REPORT_PROBLEM_PATH);
- XModelObject exceptionsObject =
PreferenceModelUtilities.getPreferenceModel().createModelObject("ProblemBufferEditor",
null);
-
- XEntityData sendData = XEntityDataImpl.create(new String[][]{
- {"SharableReportProblem"},
- {ReportPreference.ATT_ATTACH_REDHAT_LOG, "no"},
-// {ReportPreference.ATT_ATTACH_ECLIPSE_LOG, "no"}
- });
- XEntityData sendData2 = XEntityDataImpl.create(new String[][]{
- {"SharableReportProblem"},
-// {ReportPreference.ATT_ATTACH_ECLIPSE_LOG, "no"}
- });
- XEntityData infoData = XEntityDataImpl.create(new String[][]{
- {"SharableReportProblem"}, {ReportPreference.ATT_E_MAIL, "no"},
{ReportPreference.ATT_OTHER, "no"}
- });
-
- public ReportProblemWizardView() {}
+ XModelObject reportOptions = PreferenceModelUtilities.getPreferenceModel()
+ .getByPath(ReportPreference.OPTIONS_REPORT_PROBLEM_PATH);
+ XModelObject exceptionsObject = PreferenceModelUtilities
+ .getPreferenceModel()
+ .createModelObject("ProblemBufferEditor", null);
+ XEntityData sendData = XEntityDataImpl.create(new String[][] {
+ { "SharableReportProblem" },
+ { ReportPreference.ATT_ATTACH_REDHAT_LOG, "no" },
+ // {ReportPreference.ATT_ATTACH_ECLIPSE_LOG, "no"}
+ });
+ XEntityData sendData2 = XEntityDataImpl
+ .create(new String[][] { { "SharableReportProblem" },
+ // {ReportPreference.ATT_ATTACH_ECLIPSE_LOG, "no"}
+ });
+ XEntityData infoData = XEntityDataImpl.create(new String[][] {
+ { "SharableReportProblem" }, { ReportPreference.ATT_E_MAIL, "no"
},
+ { ReportPreference.ATT_OTHER, "no" } });
+
+ public ReportProblemWizardView() {
+ }
+
public Control createControl(Composite parent) {
Composite composite = new Composite(parent, SWT.NONE);
Layout layout = new GridLayout();
@@ -76,17 +96,93 @@
updateBar();
return composite;
}
+
+ /**
+ *
+ */
+ private void createStackTracesFile() {
+
+ }
+
+ /**
+ *
+ */
+ private void createUsercommentFile() {
+
+ }
+
+ /**
+ *
+ */
+ private void createEclipsePropertiesFile() {
+
+ }
+
+ /**
+ * create a ZIP file containg folloving files:
+ */
+ private void createZipFile() throws IOException {
+ byte tempBuffer[] = new byte[512];
+ String[] filesToZip = new String[] { getStackTraceFilename(),
+ getUsercommentFilename(), getEclipsePropertiesFilename() };
+
+ ZipOutputStream zout = new ZipOutputStream(new FileOutputStream(
+ getStackTraceFilename()));
+ for (int i = 0; i < filesToZip.length; i++) {
+ InputStream in = new FileInputStream(filesToZip[i]);
+ ZipEntry e = new ZipEntry(filesToZip[i].replace(File.separatorChar,
+ '/'));
+ zout.putNextEntry(e);
+ int len = 0;
+ while ((len = in.read(tempBuffer)) != -1) {
+ zout.write(tempBuffer, 0, len);
+ }
+ zout.closeEntry();
+ }
+ zout.close();
+ }
+
+ private String getLogFolderLocation() {
+ Bundle b = Platform.getBundle("org.jboss.tools.common");
+ String stateLocation = Platform.getStateLocation(b).toString().replace('\\',
'/');
+ return stateLocation;
+ }
+ private String getStackTraceFilename() {
+ return getLogFolderLocation() + "/stacktrace.txt";
+ }
+
+ private String getUsercommentFilename() {
+ return getLogFolderLocation() + "/usercomment.txt";
+ }
+
+ private String getEclipsePropertiesFilename() {
+ return getLogFolderLocation() + "/eclipse.properties";
+ }
+
+ private String getZipFilename() {
+ Date today;
+ String currentDate;
+
+ today = new Date();
+ currentDate = dtf.format(today);
+
+ return getLogFolderLocation() + "rhds-log-" + currentDate.toString() +
".zip";
+ }
+
private void createStackTracesControl(Composite parent) {
+ String zipFileName = getZipFilename();
+
stackTracesCount = ProblemReportingHelper.buffer.getSize();
- exceptionsObject.setAttributeValue("exceptions",
formatContent(ProblemReportingHelper.buffer.getContent()));
+ exceptionsObject.setAttributeValue("exceptions",
+ formatContent(ProblemReportingHelper.buffer.getContent()));
XEntityData data = (stackTracesCount > 0) ? sendData : sendData2;
boolean isSeparatorNeeded = false;
- if(stackTracesCount > 0) {
+ if (stackTracesCount > 0) {
createStackTracesLabelControl(parent);
isSeparatorNeeded = true;
}
- if(data.getAttributeData().length > 0) {
+ if (data.getAttributeData().length > 0) {
sendSupport = new XAttributeSupport(reportOptions, data, true);
sendSupport.setAutoStore(false);
GridLayout layout = getDefaultSupportLayout();
@@ -102,18 +198,19 @@
} else {
sendSupport = null;
}
- if(isSeparatorNeeded) {
+ if (isSeparatorNeeded) {
Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
separator.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
}
}
-
+
private void createProblemControl(Composite parent) {
Group g = new Group(parent, SWT.SHADOW_ETCHED_IN);
g.setText("Problem Description");
g.setLayoutData(new GridData(GridData.FILL_BOTH));
g.setLayout(new GridLayout());
- problemDescription = new Text(g, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL |
SWT.BORDER);
+ problemDescription = new Text(g, SWT.MULTI | SWT.H_SCROLL
+ | SWT.V_SCROLL | SWT.BORDER);
problemDescription.setLayoutData(new GridData(GridData.FILL_BOTH));
problemDescription.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
@@ -133,7 +230,7 @@
Control c = infoSupport.createControl(g);
c.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
}
-
+
private void createStackTracesLabelControl(Composite parent) {
Composite panel = new Composite(parent, SWT.NONE);
GridLayout layout = getDefaultSupportLayout();
@@ -145,15 +242,18 @@
d.widthHint = 16;
image.setLayoutData(d);
image.setLayoutData(new GridData());
- TextAndReferenceComponent t2 = new TextAndReferenceComponent(panel, SWT.NONE);
+ TextAndReferenceComponent t2 = new TextAndReferenceComponent(panel,
+ SWT.NONE);
d = new GridData(GridData.FILL_HORIZONTAL);
d.horizontalIndent = 5;
t2.setLayoutData(d);
- String text = "You have " + stackTracesCount + " stack traces to send
(<a>see details</a>).";
+ String text = "You have " + stackTracesCount
+ + " stack traces to send (<a>see details</a>).";
t2.setText(text, 300);
- t2.addReferenceListener(new ReferenceListener(){
+ t2.addReferenceListener(new ReferenceListener() {
public void referenceSelected(String reference) {
- XActionInvoker.invoke("EditActions.Edit", exceptionsObject, null);
+ XActionInvoker.invoke("EditActions.Edit", exceptionsObject,
+ null);
}
});
}
@@ -161,7 +261,7 @@
public Point getPreferredSize() {
return new Point(400, 500);
}
-
+
protected GridLayout getDefaultSupportLayout() {
GridLayout gridLayout = new GridLayout(2, false);
gridLayout.marginHeight = 0;
@@ -170,58 +270,65 @@
gridLayout.verticalSpacing = 5;
return gridLayout;
}
-
+
public String[] getCommands() {
- return new String[]{"Submit", CANCEL};
+ return new String[] { "Submit", CANCEL };
}
-
+
public void action(String command) {
- if(command.equals("Submit")) {
+ if (command.equals("Submit")) {
submitProblems();
super.action(OK);
} else {
super.action(command);
}
}
-
+
private void submitProblems() {
- if(sendSupport != null) sendSupport.store();
- if(infoSupport != null) infoSupport.store();
- String text = CommonPlugin.getEnvironment() + "\n" +
problemDescription.getText();
- boolean addRedHatLog =
"yes".equals(ReportPreference.ATTACH_REDHAT_LOG_OPTION.getValue());
- if(addRedHatLog && stackTracesCount > 0) {
+ if (sendSupport != null)
+ sendSupport.store();
+ if (infoSupport != null)
+ infoSupport.store();
+ String text = CommonPlugin.getEnvironment() + "\n"
+ + problemDescription.getText();
+ boolean addRedHatLog = "yes"
+ .equals(ReportPreference.ATTACH_REDHAT_LOG_OPTION.getValue());
+ if (addRedHatLog && stackTracesCount > 0) {
String log = exceptionsObject.getAttributeValue("exceptions");
text += "\n----------Red Hat Log-----------\n" + log + "\n";
}
- boolean addEclipseLog =
"yes".equals(ReportPreference.ATTACH_ECLIPSE_LOG_OPTION.getValue());
- if(addEclipseLog) {
- String eclipseLog = ProblemReportingHelper.buffer.getEclipseLogContent();
+ boolean addEclipseLog = "yes"
+ .equals(ReportPreference.ATTACH_ECLIPSE_LOG_OPTION.getValue());
+ if (addEclipseLog) {
+ String eclipseLog = ProblemReportingHelper.buffer
+ .getEclipseLogContent();
text += "\n----------Eclipse Log----------\n" + eclipseLog +
"\n";
}
String email = ReportPreference.E_MAIL_OPTION.getValue();
String other = ReportPreference.OTHER_OPTION.getValue();
ProblemReportingHelper.buffer.report(text, email, other, addRedHatLog);
- if(addRedHatLog) {
- //clean is to be done after report,
- //which is executed as background job.
-// ProblemReportingHelper.buffer.clean();
+ if (addRedHatLog) {
+ // clean is to be done after report,
+ // which is executed as background job.
+ // ProblemReportingHelper.buffer.clean();
}
}
-
+
static int LINE_LIMIT = 70;
-
+
private String formatContent(String content) {
StringBuffer sb = new StringBuffer();
StringTokenizer st = new StringTokenizer(content, "\n", true);
- while(st.hasMoreTokens()) {
+ while (st.hasMoreTokens()) {
String t = st.nextToken();
- if("\n".equals(t)) {
+ if ("\n".equals(t)) {
sb.append(t);
} else {
- while(t.length() > LINE_LIMIT) {
+ while (t.length() > LINE_LIMIT) {
String t1 = t.substring(0, LINE_LIMIT);
int i = t1.lastIndexOf(' ');
- if(i > 40) t1 = t1.substring(0, i);
+ if (i > 40)
+ t1 = t1.substring(0, i);
t = t.substring(t1.length());
sb.append(t1).append("\n");
}
@@ -234,16 +341,21 @@
public void updateBar() {
getCommandBar().setEnabled("Submit", !isMessageEmpty());
}
-
+
boolean isMessageEmpty() {
- if(sendSupport != null) {
- IModelPropertyEditorAdapter a =
sendSupport.getPropertyEditorAdapterByName(ReportPreference.ATT_ATTACH_REDHAT_LOG);
- if(a != null && "yes".equals(a.getValue())) return false;
- a =
sendSupport.getPropertyEditorAdapterByName(ReportPreference.ATT_ATTACH_ECLIPSE_LOG);
- if(a != null && "yes".equals(a.getValue())) return false;
+ if (sendSupport != null) {
+ IModelPropertyEditorAdapter a = sendSupport
+ .getPropertyEditorAdapterByName(ReportPreference.ATT_ATTACH_REDHAT_LOG);
+ if (a != null && "yes".equals(a.getValue()))
+ return false;
+ a = sendSupport
+ .getPropertyEditorAdapterByName(ReportPreference.ATT_ATTACH_ECLIPSE_LOG);
+ if (a != null && "yes".equals(a.getValue()))
+ return false;
}
String text = problemDescription.getText();
- if(text == null || text.trim().length() == 0) return true;
+ if (text == null || text.trim().length() == 0)
+ return true;
return false;
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/resources/ResourceLayoutManager.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/resources/ResourceLayoutManager.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/resources/ResourceLayoutManager.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -94,7 +94,7 @@
private Document getLayoutDocument(IResource resource) {
Document document = null;
if (resource==null) {
- log(Status.ERROR, ModelUIMessages.getString(ERROR_RESOURCE_NULL));
+ ModelUIPlugin.getPluginLog().logError(ModelUIMessages.getString(ERROR_RESOURCE_NULL));
return null;
}
@@ -114,13 +114,13 @@
try {
document = loadDocument(resource);
} catch (ParserConfigurationException e) {
- log(Status.OK, ModelUIMessages.getString(ERROR_UNKNOW_EXCEPTION), e);
+ ModelUIPlugin.getPluginLog().logError(ModelUIMessages.getString(ERROR_UNKNOW_EXCEPTION),
e);
} catch (SAXException e) {
- log(Status.OK, ModelUIMessages.getString(ERROR_UNKNOW_EXCEPTION), e);
+ ModelUIPlugin.getPluginLog().logError(ModelUIMessages.getString(ERROR_UNKNOW_EXCEPTION),
e);
} catch (IOException e) {
- log(Status.OK, ModelUIMessages.getString(ERROR_UNKNOW_EXCEPTION), e);
+ ModelUIPlugin.getPluginLog().logError(ModelUIMessages.getString(ERROR_UNKNOW_EXCEPTION),
e);
} catch (AnotherResourceException e) {
- log(Status.OK, ModelUIMessages.getString(ERROR_ANOTHER_HEAD), e);
+ ModelUIPlugin.getPluginLog().logError(ModelUIMessages.getString(ERROR_ANOTHER_HEAD),
e);
}
if (document!=null){
hashMap.put(fullResourceLocation, document);
@@ -132,7 +132,7 @@
document = createNewDocument(resource);
} catch (ParserConfigurationException e) {
//log(Status.ERROR, ModelUIMessages.getString(ERROR_CREATE_DOCUMENT, new String[]
{fullLayoutLocation, fullResourceLocation}));
- log(Status.ERROR, ModelUIMessages.getString(ERROR_CREATE_DOCUMENT, new String[]
{layoutLocation, fullResourceLocation}));
+ ModelUIPlugin.getPluginLog().logError(
ModelUIMessages.getString(ERROR_CREATE_DOCUMENT, new String[] {layoutLocation,
fullResourceLocation}));
}
if (document!=null){
hashMap.put(fullResourceLocation, document);
@@ -176,7 +176,7 @@
if (nodeList==null || nodeList.getLength()==0 || nodeList.item(0)==null) {
// warning
//log(ModelUIMessages.getString(WARNING_EMPTY_HEAD, new String[]
{fullLayoutLocation}));
- log(ModelUIMessages.getString(WARNING_EMPTY_HEAD, new String[] {layoutLocation}));
+ ModelUIPlugin.getPluginLog().logInfo(ModelUIMessages.getString(WARNING_EMPTY_HEAD,
new String[] {layoutLocation}));
// create new head
createRoot(resource, document);
} /*else {
@@ -225,7 +225,7 @@
writer.close();
} catch (Exception e) {
//log(Status.ERROR, ModelUIMessages.getString(ERROR_CREATE_DOCUMENT, new String[]
{fullLayoutLocation, fullResourceLocation}), e);
- log(Status.ERROR, ModelUIMessages.getString(ERROR_CREATE_DOCUMENT, new String[]
{layoutLocation, fullResourceLocation}), e);
+ ModelUIPlugin.getPluginLog().logError(ModelUIMessages.getString(ERROR_CREATE_DOCUMENT,
new String[] {layoutLocation, fullResourceLocation}), e);
}
}
@@ -248,19 +248,7 @@
return element;
}
- private void log(int status, String message, Exception e) {
- Status s = new Status(status, ModelUIPlugin.PLUGIN_ID, Status.OK, message, e);
- ModelUIPlugin.log(s);
- }
- private void log(int status, String message) {
- log(status, message, null);
- }
-
- private void log(String message) {
- log(Status.OK, message, null);
- }
-
private IPath getPluginMetadataPath() {
return Platform.getStateLocation(Platform.getBundle(ModelUIPlugin.PLUGIN_ID));
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/TemplatesConfiguration.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/TemplatesConfiguration.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/TemplatesConfiguration.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -44,7 +44,7 @@
c.text= buf.toString();
} catch (BadLocationException excp) {
- ModelUIPlugin.log(excp);
+ ModelUIPlugin.getPluginLog().logError(excp);
// stop work
}
}
@@ -58,7 +58,7 @@
}
}
} catch (Exception x) {
- ModelUIPlugin.log("Error in customizing document command", x);
+ ModelUIPlugin.getPluginLog().logError("Error in customizing document
command", x);
}
super.customizeDocumentCommand(d, c);
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/configuration/MetaConfigurationLoader.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/configuration/MetaConfigurationLoader.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/configuration/MetaConfigurationLoader.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -30,7 +30,7 @@
String path =
FileLocator.resolve(MetaConfigurationLoader.class.getResource("/dtds/meta-templates.dtd")).toString();
XMLEntityResolver.registerPublicEntity("-//Red Hat Inc.//DTD Meta
Templates 1.0//EN", path);
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
@@ -63,7 +63,7 @@
try {
XMLUtilities.serialize(element, writer);
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
ModelUIPlugin.getDefault().getPluginPreferences().setValue(PREFERENCE_KEY,
writer.toString());
}
@@ -83,7 +83,7 @@
try {
XMLUtilities.serialize(element, location);
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
}
@@ -111,7 +111,7 @@
private void processExtensions(MetaConfiguration c) {
IExtensionPoint extensionPoint =
Platform.getExtensionRegistry().getExtensionPoint(EXTENSION_POINT);
if(extensionPoint == null) {
- ModelUIPlugin.log("Cannot find extension point \"" + EXTENSION_POINT,
true);
+ ModelUIPlugin.getPluginLog().logError("Cannot find extension point
\"" + EXTENSION_POINT);
}
IConfigurationElement[] members = extensionPoint.getConfigurationElements();
for (int m = 0; m < members.length; m++) {
@@ -123,7 +123,7 @@
} else if (META_TEMPLATE_GROUP.equals(member.getName())) {
doMetaTemplate(member, c);
} else {
- ModelUIPlugin.log("Error in declaring extension \"" +
EXTENSION_POINT+"\" at " + name, false);
+ ModelUIPlugin.getPluginLog().logInfo("Error in declaring extension
\"" + EXTENSION_POINT+"\" at " + name);
}
}
}
@@ -140,7 +140,7 @@
try {
url = FileLocator.resolve(bundle.getEntry("/"));
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
String file = element.getAttribute(FILE);
String translations = element.getAttribute(TRANSLATIONS);
@@ -157,7 +157,7 @@
loadGroup(g, root, properties);
}
} catch (IOException e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
@@ -170,9 +170,9 @@
InputStream is = new FileInputStream(propertiesFile);
properties = new PropertyResourceBundle(is);
} catch (FileNotFoundException e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
} catch (IOException e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/MultiPageContributor.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/MultiPageContributor.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/MultiPageContributor.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -82,7 +82,7 @@
fToggleOccurencesMarkUp.setEditor(getTextEditor(part));
fToggleOccurencesMarkUp.update();
} catch (Exception x) {
- ModelUIPlugin.log(x);
+ ModelUIPlugin.getPluginLog().logError(x);
}
updateStatus();
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/PropertiesTextEditorComponent.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/PropertiesTextEditorComponent.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/PropertiesTextEditorComponent.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -258,7 +258,7 @@
doSetInput(input);
}
} catch (CoreException x) {
- ModelUIPlugin.log(x);
+ ModelUIPlugin.getPluginLog().logError(x);
}
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/TextEditorComponent.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/TextEditorComponent.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/TextEditorComponent.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -182,7 +182,7 @@
FileAnyImpl f = (FileAnyImpl)getModelObject();
if(f != null) f.edit(getText());
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
} finally {
lock = false;
modified = false;
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/TextEditorSupport.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/TextEditorSupport.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/TextEditorSupport.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -88,7 +88,7 @@
FileAnyImpl f = (FileAnyImpl)getModelObject();
if(f != null) f.edit(provider.getText());
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
} finally {
lock--;
modified = false;
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorComponent.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorComponent.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorComponent.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -308,7 +308,7 @@
changeListener = null;
}
} catch (Exception t) {
- ModelUIPlugin.log("Error in disposing xml editor", t);
+ ModelUIPlugin.getPluginLog().logError("Error in disposing xml editor", t);
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorStandAlone.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorStandAlone.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLTextEditorStandAlone.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -98,7 +98,7 @@
update0();
}
} catch (Exception t) {
- ModelUIPlugin.log("Error in updating editor", t);
+ ModelUIPlugin.getPluginLog().logError("Error in updating editor", t);
}
lock2 = false;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/dnd/TextEditorDrop.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/dnd/TextEditorDrop.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/dnd/TextEditorDrop.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -110,7 +110,7 @@
}
provider.insert(p);
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/preferences/EditorsPreferencesPage.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/preferences/EditorsPreferencesPage.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/preferences/EditorsPreferencesPage.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -32,7 +32,7 @@
try {
initialize();
} catch (Exception t) {
- ModelUIPlugin.log("Error in initializing editors preference page", t);
+ ModelUIPlugin.getPluginLog().logError("Error in initializing editors preference
page", t);
}
return model;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/xmleditor/XMLTextEditor.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/xmleditor/XMLTextEditor.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/xmleditor/XMLTextEditor.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -301,7 +301,7 @@
FileAnyImpl f = (FileAnyImpl)getModelObject();
if(f != null) f.edit(getSourceViewer().getDocument().get());
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
} finally {
setModified(false);
lock = false;
@@ -335,7 +335,7 @@
try {
object = ((IModelObjectEditorInput)input).getXModelObject();
} catch (Exception ex) {
- ModelUIPlugin.log("Error while getting model object from editor input",
ex);
+ ModelUIPlugin.getPluginLog().logError("Error while getting model object from
editor input", ex);
}
}
if(getSourceViewer() != null && getSourceViewer().getDocument() != null) {
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/util/ExceptionHandler.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/util/ExceptionHandler.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/util/ExceptionHandler.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -13,7 +13,6 @@
import java.lang.reflect.InvocationTargetException;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.swt.widgets.Shell;
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
public class ExceptionHandler extends org.eclipse.jdt.internal.ui.util.ExceptionHandler
{
@@ -32,9 +31,8 @@
protected void perform(CoreException e, Shell shell, String title, String message) {
if (e.getStatus() != null) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
//message ignored!
- ProblemReportingHelper.reportProblem(ModelUIPlugin.PLUGIN_ID, e);
} else {
super.perform(e, shell, title, message);
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/util/ExtensionPointUtils.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/util/ExtensionPointUtils.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/util/ExtensionPointUtils.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -24,7 +24,7 @@
try {
return
(INewWizard)ExtensionPointUtil.findClassByElementId("org.eclipse.ui.newWizards",
wizardId);
} catch (Exception ex) {
- ModelUIPlugin.log(ex);
+ ModelUIPlugin.getPluginLog().logError(ex);
}
return null;
}
@@ -34,7 +34,7 @@
try {
return
(IImportWizard)ExtensionPointUtil.findClassByElementId("org.eclipse.ui.importWizards",
wizardId);
} catch (Exception ex) {
- ModelUIPlugin.log(ex);
+ ModelUIPlugin.getPluginLog().logError(ex);
}
return null;
}
@@ -45,7 +45,7 @@
try {
return
(IObjectActionDelegate)ExtensionPointUtil.findClassByElementId("org.eclipse.ui.popupMenus",
actionId);
} catch (Exception ex) {
- ModelUIPlugin.log(ex);
+ ModelUIPlugin.getPluginLog().logError(ex);
}
return null;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/FilteredTreesCache.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/FilteredTreesCache.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/FilteredTreesCache.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -87,7 +87,7 @@
try {
result =
(XFilteredTree)ModelFeatureFactory.getInstance().createFeatureInstance(classname);
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
return null;
}
result.setModel(model);
@@ -96,7 +96,7 @@
IProject p = EclipseResourceUtil.getProject(model.getRoot());
IModelNature nature = EclipseResourceUtil.getModelNature(p);
if(nature != null) {
- ModelUIPlugin.log("Red Hat Project " + p.getName() + " is
corrupted.");
+ ModelUIPlugin.getPluginLog().logInfo("Red Hat Project " + p.getName() +
" is corrupted.");
}
}
return result;
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/NavigatorContentProvider.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/NavigatorContentProvider.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/NavigatorContentProvider.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -265,7 +265,7 @@
XFilteredTree filteredTree = getFilteredTree(nature.getModel().getRoot());
return (filteredTree != null) ? filteredTree.getRoot() : null;
} catch (Exception ex) {
- ModelUIPlugin.log(ex);
+ ModelUIPlugin.getPluginLog().logError(ex);
}
return null;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/NavigatorMenuInvoker.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/NavigatorMenuInvoker.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/NavigatorMenuInvoker.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -58,7 +58,7 @@
try {
return
Platform.getPreferencesService().getBoolean("org.eclipse.ui.workbench",
"OPEN_ON_SINGLE_CLICK", true, new IScopeContext[]{new InstanceScope()});
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
return false;
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteAdapter.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteAdapter.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteAdapter.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -48,7 +48,6 @@
import org.jboss.tools.common.model.event.XModelTreeListener;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.model.util.IconUtil;
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.ui.dnd.DnDUtil;
import org.jboss.tools.common.model.ui.dnd.ModelTransfer;
@@ -431,7 +430,7 @@
}
private void message(Exception e) {
- ProblemReportingHelper.reportProblem(ModelUIPlugin.PLUGIN_ID, e);
+ ModelUIPlugin.getPluginLog().logError( e);
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteContents.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteContents.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteContents.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -56,13 +56,13 @@
if (project.exists() && project.isOpen() &&
project.hasNature("org.jboss.tools.struts.strutsnature"))
natures.add("struts");
} catch (CoreException e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
try {
if (project.exists() && project.isOpen() &&
project.hasNature("org.jboss.tools.jsf.jsfnature"))
natures.add("jsf");
} catch (CoreException e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
if (natures.size() > 0)
natureTypes = natures.toArray(new String[natures.size()]);
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteInsertHelper.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteInsertHelper.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteInsertHelper.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -139,10 +139,10 @@
}
}
} catch (Exception x) {
- ModelUIPlugin.log("Error while inserting text into editor", x);
+ ModelUIPlugin.getPluginLog().logError("Error while inserting text into
editor", x);
}
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
@@ -164,7 +164,7 @@
try {
body = length > 0 ? doc.get(offset, length): "";
} catch (BadLocationException e1) {
- ModelUIPlugin.log(e1);
+ ModelUIPlugin.getPluginLog().logError(e1);
}
if (startText == null) startText = "";
@@ -191,7 +191,7 @@
}
}
} catch (BadLocationException e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
@@ -205,7 +205,7 @@
try {
doc.replace(offset, length, text);
} catch (BadLocationException ex) {
- ModelUIPlugin.log(ex);
+ ModelUIPlugin.getPluginLog().logError(ex);
}
ITextSelection sel = new TextSelection(offset + pos, 0);
@@ -339,7 +339,7 @@
try {
return Platform.getPreferencesService().getInt("org.eclipse.ui.editors",
AbstractDecoratedTextEditorPreferenceConstants.EDITOR_TAB_WIDTH, 4, new
IScopeContext[]{new InstanceScope()});
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
return 4;
}
}
@@ -475,7 +475,7 @@
IRegion region= fDocument.getLineInformation(fLineIndex++);
return fDocument.get(region.getOffset(), region.getLength());
} catch (BadLocationException e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
throw new NoSuchElementException();
}
}
@@ -534,7 +534,7 @@
defaultPrefix = text.substring(j1 + 1, j);
pr = prefixes.getProperty(uri, defaultPrefix);
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
if(pr.length() > 0) {
text = text.substring(0, i) + pr + ":" + text.substring(j + 1);
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteInsertManager.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteInsertManager.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteInsertManager.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -10,10 +10,15 @@
******************************************************************************/
package org.jboss.tools.common.model.ui.views.palette;
-import java.util.*;
-import org.eclipse.core.runtime.*;
+import java.util.HashMap;
+import java.util.Properties;
-import org.jboss.tools.common.model.plugin.ModelPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.Platform;
+import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.jst.web.tld.URIConstants;
public class PaletteInsertManager {
@@ -41,7 +46,7 @@
try {
return o.createExecutableExtension("class");
} catch(CoreException e) {
- ModelPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
return null;
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteTaglibInserter.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteTaglibInserter.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteTaglibInserter.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -110,7 +110,7 @@
}
}
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
} finally {
if (model != null) model.releaseFromRead();
}
@@ -192,7 +192,7 @@
selectedSource.insert(selectedSource.length()-1, attribute);
d.replace(so, seo-so, selectedSource.toString());
} catch (Exception t) {
- ModelUIPlugin.log("", t);
+ ModelUIPlugin.getPluginLog().logError("", t);
}
}
return p;
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteViewPart.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteViewPart.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteViewPart.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -179,7 +179,7 @@
} catch (NoSuchMethodException ne) {
return false;
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
return false;
}
}
@@ -216,7 +216,7 @@
editor = (ITextEditor)o;
}
} catch (Exception t) {
- ModelUIPlugin.log("Error while getting active text editor", t);
+ ModelUIPlugin.getPluginLog().logError("Error while getting active text
editor", t);
}
}
return editor;
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/TextAndReferenceComponent.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/TextAndReferenceComponent.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/TextAndReferenceComponent.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -39,7 +39,7 @@
FontData d = plain.getFontData()[0];
bold = new Font(null, d.getName(), d.getHeight(), d.getStyle() | SWT.BOLD);
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
@@ -87,7 +87,7 @@
try {
pack();
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewClassCreationWizard.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewClassCreationWizard.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewClassCreationWizard.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -38,7 +38,7 @@
WizardDialog dialog = new
WizardDialog(ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(),
wizard);
dialog.open();
} else {
- ModelUIPlugin.log("Unable to create wizard
'org.eclipse.jdt.ui.wizards.NewClassCreationWizard'.", new
ClassNotFoundException());
+ ModelUIPlugin.getPluginLog().logError("Unable to create wizard
'org.eclipse.jdt.ui.wizards.NewClassCreationWizard'.", new
ClassNotFoundException());
}
return 0;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewFileWizard.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewFileWizard.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewFileWizard.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -13,8 +13,6 @@
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.*;
import org.eclipse.ui.*;
-
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
import org.jboss.tools.common.model.ui.ModelUIImages;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
@@ -42,7 +40,7 @@
try {
context.execute();
} catch (Exception e) {
- ProblemReportingHelper.reportProblem(ModelUIPlugin.PLUGIN_ID, e);
+ ModelUIPlugin.getPluginLog().logError(e);
return false;
}
return true;
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewJSPFileWizard.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewJSPFileWizard.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/NewJSPFileWizard.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -12,7 +12,7 @@
import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport;
import org.jboss.tools.common.model.files.handlers.CreateFileSupport;
-import org.jboss.tools.common.model.plugin.ModelPlugin;
+import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.util.ModelFeatureFactory;
public class NewJSPFileWizard extends NewFileWizardEx {
@@ -27,7 +27,7 @@
try {
support =
(CreateFileSupport)ModelFeatureFactory.getInstance().createFeatureInstance("org.jboss.tools.jst.web.model.handlers.CreateJSPFileSupport");
} catch (Exception e) {
- ModelPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
if(support == null) {
support = new CreateFileSupport();
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/NewClassWizard.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/NewClassWizard.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/NewClassWizard.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -90,12 +90,12 @@
try {
getContainer().run(canRunForked(), true, new WorkbenchRunnableAdapter(op,
getSchedulingRule()));
} catch (InvocationTargetException e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
return false;
} catch (InterruptedException e) {
return false;
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
return false;
}
return true;
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/NewTypeWizardAdapter.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/NewTypeWizardAdapter.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/NewTypeWizardAdapter.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -70,7 +70,7 @@
try {
this.javaProject = (IJavaProject)project.getNature(JavaCore.NATURE_ID);
} catch (CoreException e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
this.project = project;
}
@@ -178,7 +178,7 @@
rawData = Boolean.FALSE.booleanValue();
} catch (JavaModelException e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/query/AbstractQueryWizardView.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/query/AbstractQueryWizardView.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/query/AbstractQueryWizardView.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -21,7 +21,6 @@
import org.jboss.tools.common.meta.help.HelpUtil;
import org.jboss.tools.common.meta.key.WizardKeys;
import org.jboss.tools.common.model.XModel;
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
import org.jboss.tools.common.model.ui.*;
public abstract class AbstractQueryWizardView implements CommandBarListener {
@@ -107,7 +106,7 @@
if(model != null) try {
HelpUtil.helpEclipse(model, helpkey);
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
}
@@ -117,7 +116,7 @@
}
public void exception(Exception e) {
- ProblemReportingHelper.reportProblem(ModelUIPlugin.PLUGIN_ID, e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
public void setHelpKey(String key) {
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special/DefaultSpecialWizard.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special/DefaultSpecialWizard.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special/DefaultSpecialWizard.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -18,7 +18,6 @@
import org.jboss.tools.common.meta.action.impl.*;
import org.jboss.tools.common.meta.help.HelpUtil;
import org.jboss.tools.common.model.util.ModelFeatureFactory;
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
public class DefaultSpecialWizard implements SpecialWizard, SpecialWizardControlListener
{
@@ -64,7 +63,7 @@
try {
support.action("STEP");
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
dialog.open();
@@ -78,7 +77,7 @@
try {
HelpUtil.helpEclipse(support.getTarget().getModel(), support.getHelpKey());
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
return;
}
@@ -87,12 +86,12 @@
support.action(name);
dialog.setMessage("");
} catch (Exception e) {
- ProblemReportingHelper.reportProblem(ModelUIPlugin.PLUGIN_ID, e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
try {
setStep();
} catch (Exception t) {
- ModelUIPlugin.log("Error while executing action " + name, t);
+ ModelUIPlugin.getPluginLog().logError("Error while executing action " +
name, t);
}
}
@@ -123,7 +122,7 @@
try {
wizardStep.validate();
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
@@ -139,7 +138,7 @@
}
step.setSupport(support, i);
} catch (Exception e) {
- ModelUIPlugin.log("Cannot load class '" + cls + "'.");
+ ModelUIPlugin.getPluginLog().logError("Cannot load class '" + cls +
"'.");
}
return step;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/standard/DefaultStandardStep.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/standard/DefaultStandardStep.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/standard/DefaultStandardStep.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -76,7 +76,7 @@
try {
support.action(SpecialWizardSupport.BACK);
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
setTitle(support.getSubtitle());
@@ -100,7 +100,7 @@
validate();
updateFieldEnablement();
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/standard/DefaultStandardWizard.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/standard/DefaultStandardWizard.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/standard/DefaultStandardWizard.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -18,7 +18,6 @@
import org.jboss.tools.common.meta.action.XEntityData;
import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport;
import org.jboss.tools.common.meta.action.impl.WizardDataValidator;
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
public class DefaultStandardWizard extends Wizard {
@@ -36,7 +35,7 @@
support.action(SpecialWizardSupport.FINISH);
return support.isFinished();
} catch (Exception e) {
- ProblemReportingHelper.reportProblem(ModelUIPlugin.PLUGIN_ID, e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
return false;
}
@@ -71,7 +70,7 @@
try {
support.action(SpecialWizardSupport.NEXT);
} catch (Exception e) {
- ProblemReportingHelper.reportProblem(ModelUIPlugin.PLUGIN_ID, e);
+ ModelUIPlugin.getPluginLog().logError(e);
}
int id = support.getStepId();
return steps[id];
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/util/XModelTreeListenerSWTASync.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/util/XModelTreeListenerSWTASync.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/util/XModelTreeListenerSWTASync.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -94,7 +94,7 @@
++count;
XModelTreeListener l = listener;
if (listener == null) {
- ModelUIPlugin.log("ModelListener is disposed, but cannot removed from
model!!!!");
+ ModelUIPlugin.getPluginLog().logInfo("ModelListener is disposed, but cannot
removed from model!!!!");
head = null;
tail = null;
return;
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/util/XModelTreeListenerSWTSync.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/util/XModelTreeListenerSWTSync.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/util/XModelTreeListenerSWTSync.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -36,7 +36,7 @@
if(listener != null) {
listener.nodeChanged(event);
} else {
- ModelUIPlugin.log("ModelListener is disposed, but not removed from
model!!!!");
+ ModelUIPlugin.getPluginLog().logInfo("ModelListener is disposed, but not
removed from model!!!!");
}
}
}
@@ -50,7 +50,7 @@
if(listener != null) {
listener.structureChanged(event);
} else {
- ModelUIPlugin.log("ModelListener is disposed, but not removed from
model!!!!");
+ ModelUIPlugin.getPluginLog().logInfo("ModelListener is disposed, but not
removed from model!!!!");
}
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesCompoundEditor.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesCompoundEditor.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesCompoundEditor.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -37,7 +37,7 @@
propertiesEditor.init(getEditorSite(), getEditorInput());
index = addPage(propertiesEditor, getEditorInput());
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
return;
}
// Control control = propertiesEditor.createControl(getContainer());
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -216,7 +216,7 @@
public void doOperation(int operation) {
if (operation>actionMapping.size()) {
- ModelUIPlugin.log(new RuntimeException("Can not find global action with index:
"+operation));
+ ModelUIPlugin.getPluginLog().logError(new RuntimeException("Can not find global
action with index: "+operation));
} else {
String globalAction = (String)actionMapping.get(operation);
doGlobalAction(globalAction);
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/text/PropertyTextEditorSupport.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/text/PropertyTextEditorSupport.java 2007-06-26
23:10:13 UTC (rev 2189)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/text/PropertyTextEditorSupport.java 2007-06-27
10:24:38 UTC (rev 2190)
@@ -36,7 +36,7 @@
try {
loader.edit(getModelObject(), provider.getText());
} catch (Exception e) {
- ModelUIPlugin.log(e);
+ ModelUIPlugin.getPluginLog().logError(e);
} finally {
lock--;
setModified (false);