[jboss-svn-commits] JBL Code SVN: r10688 - in labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin: META-INF and 27 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Apr 1 21:58:09 EDT 2007
Author: mark.proctor at jboss.com
Date: 2007-04-01 21:58:09 -0400 (Sun, 01 Apr 2007)
New Revision: 10688
Added:
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java
Removed:
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsIDEPlugin.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/ide/
Modified:
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/build.properties
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsPluginImages.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/action/ConvertToDroolsProjectAction.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/builder/DroolsBuilder.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/builder/IDroolsModelMarker.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/builder/Util.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/core/ui/FilterActionGroup.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/AgendaLogicalStructureDelegate.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/AgendaViewContentProvider.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/ApplicationDataViewContentProvider.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/AuditView.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/DebugUtil.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/DroolsDebugEventHandlerView.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/DroolsDebugViewContentProvider.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/WorkingMemoryViewContentProvider.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/actions/DeleteLogAction.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/actions/OpenLogAction.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/actions/RefreshLogAction.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/actions/ShowEventCauseAction.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/actions/ShowLogicalStructureAction.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/core/DroolsDebugModel.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/core/DroolsDebugTarget.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/core/DroolsLineBreakpoint.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/core/DroolsLineBreakpointMarkerUpdater.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/core/DroolsStackFrame.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/dsl/editor/DSLEditor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/AbstractRuleEditor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DRLAnnotationModel.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DRLReconcilingStrategy.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DRLRuleEditor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DRLRuleEditor2.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DroolsLineBreakpointAdapter.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DroolsPairMatcher.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/DefaultCompletionProcessor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/RuleCompletionProcessor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/outline/RuleContentOutlinePage.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/rete/ReteViewer.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/rete/part/VertexEditPartFactory.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/GenericModelEditor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/DataTypeCombo.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/DataTypeEditorComposite.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/EditorComposite.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/RuleFlowModelEditor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/RuleFlowPaletteFactory.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/action/CheckRuleFlowAction.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/EndNodeEditPart.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/StartNodeEditPart.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableDialog.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/preferences/DroolsPreferencePage.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/util/DroolsClasspathContainer.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/util/ProjectClassLoader.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/view/rules/RulesView.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/decisiontable/NewDTFilePage.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/decisiontable/NewDTFileWizard.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/dsl/NewDSLFilePage.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/dsl/NewDSLFileWizard.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/project/NewDroolsProjectWizard.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/rule/NewRulePackagePage.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/rule/NewRulePackageWizard.java
Log:
JBRULES-761 Automate the Eclipse build
-refactored DroolsIDEPlugin to DroolsEclipsePlugin
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/META-INF/MANIFEST.MF 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/META-INF/MANIFEST.MF 2007-04-02 01:58:09 UTC (rev 10688)
@@ -3,7 +3,7 @@
Bundle-Name: JBoss Rules IDE Plug-in
Bundle-SymbolicName: org.drools.eclipse;singleton:=true
Bundle-Version: 3.1.0.M1
-Bundle-Activator: org.drools.eclipse.DroolsIDEPlugin
+Bundle-Activator: org.drools.eclipse.DroolsEclipsePlugin
Bundle-Vendor: krisv,mic
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/build.properties
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/build.properties 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/build.properties 2007-04-02 01:58:09 UTC (rev 10688)
@@ -3,9 +3,7 @@
icons/,\
plugin.xml,\
help/,\
- lib/,\
- lib/drools-compiler-3.1.0-M1.jar,\
- lib/drools-core-3.1.0-M1.jar
+ lib/
source.ide.jar = src/main/java/
output.ide.jar = target/classes/
src.includes = .project,\
@@ -13,7 +11,7 @@
build.properties,\
icons/,\
help/,\
- lib/,\
plugin.xml,\
src/,\
- META-INF/
+ META-INF/,\
+ lib/
Copied: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java (from rev 10663, labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsIDEPlugin.java)
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -0,0 +1,365 @@
+package org.drools.eclipse;
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.Reader;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+import org.drools.compiler.DrlParser;
+import org.drools.compiler.DroolsParserException;
+import org.drools.compiler.PackageBuilder;
+import org.drools.compiler.PackageBuilderConfiguration;
+import org.drools.eclipse.DRLInfo.FunctionInfo;
+import org.drools.eclipse.DRLInfo.RuleInfo;
+import org.drools.eclipse.builder.DroolsBuilder;
+import org.drools.eclipse.builder.Util;
+import org.drools.eclipse.editors.AbstractRuleEditor;
+import org.drools.eclipse.editors.DRLRuleEditor;
+import org.drools.eclipse.editors.DSLAdapter;
+import org.drools.eclipse.preferences.IDroolsConstants;
+import org.drools.eclipse.util.ProjectClassLoader;
+import org.drools.lang.descr.PackageDescr;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.debug.core.DebugException;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The main plugin class to be used in the desktop.
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">kris verlaenen </a>
+ */
+public class DroolsEclipsePlugin extends AbstractUIPlugin {
+
+ public static final int INTERNAL_ERROR = 120;
+ public static final String PLUGIN_ID = "org.drools.eclipse";
+ public static final String BUILD_RESULT_PACKAGE = "Package";
+ public static final String BUILD_RESULT_PACKAGE_DESCR = "PackageDescr";
+
+ //The shared instance.
+ private static DroolsEclipsePlugin plugin;
+ //Resource bundle.
+ private ResourceBundle resourceBundle;
+ private Map colors = new HashMap();
+ private Map parsedRules = new HashMap();
+ private Map compiledRules = new HashMap();
+ private Map ruleInfoByClassNameMap = new HashMap();
+ private Map functionInfoByClassNameMap = new HashMap();
+ private boolean useCachePreference;
+
+ /**
+ * The constructor.
+ */
+ public DroolsEclipsePlugin() {
+ super();
+ plugin = this;
+ }
+
+ /**
+ * This method is called upon plug-in activation
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ IPreferenceStore preferenceStore = getPreferenceStore();
+ useCachePreference = preferenceStore.getBoolean(IDroolsConstants.CACHE_PARSED_RULES);
+ preferenceStore.addPropertyChangeListener(new IPropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent event) {
+ if (IDroolsConstants.CACHE_PARSED_RULES.equals(event.getProperty())) {
+ useCachePreference = ((Boolean) event.getNewValue()).booleanValue();
+ if (!useCachePreference) {
+ parsedRules.clear();
+ compiledRules.clear();
+ ruleInfoByClassNameMap.clear();
+ functionInfoByClassNameMap.clear();
+ }
+ }
+ }
+ });
+
+ }
+
+ /**
+ * This method is called when the plug-in is stopped
+ */
+ public void stop(BundleContext context) throws Exception {
+ super.stop(context);
+ plugin = null;
+ resourceBundle = null;
+ parsedRules = null;
+ compiledRules = null;
+ Iterator iterator = colors.values().iterator();
+ while (iterator.hasNext()) {
+ ((Color) iterator.next()).dispose();
+ }
+ }
+
+ /**
+ * Returns the shared instance.
+ */
+ public static DroolsEclipsePlugin getDefault() {
+ return plugin;
+ }
+
+ /**
+ * Returns the string from the plugin's resource bundle,
+ * or 'key' if not found.
+ */
+ public static String getResourceString(String key) {
+ ResourceBundle bundle = DroolsEclipsePlugin.getDefault().getResourceBundle();
+ try {
+ return (bundle != null) ? bundle.getString(key) : key;
+ } catch (MissingResourceException e) {
+ return key;
+ }
+ }
+
+ /**
+ * Returns the plugin's resource bundle,
+ */
+ public ResourceBundle getResourceBundle() {
+ try {
+ if (resourceBundle == null)
+ resourceBundle = ResourceBundle.getBundle("droolsIDE.DroolsIDEPluginResources");
+ } catch (MissingResourceException x) {
+ resourceBundle = null;
+ }
+ return resourceBundle;
+ }
+
+ /**
+ * Returns an image descriptor for the image file at the given
+ * plug-in relative path.
+ * Uses the plug ins image registry to "cache" it.
+ *
+ * @param path the path
+ * @return the image descriptor
+ */
+ public static ImageDescriptor getImageDescriptor(String path) {
+
+ DroolsEclipsePlugin plugin = getDefault();
+ ImageRegistry reg = plugin.getImageRegistry();
+ ImageDescriptor des = reg.getDescriptor( path );
+ if (des == null) {
+ des = AbstractUIPlugin.imageDescriptorFromPlugin("org.drools.eclipse", path);
+ reg.put( path, des );
+ }
+ return des;
+ }
+
+ public static String getUniqueIdentifier() {
+ if (getDefault() == null) {
+ return PLUGIN_ID;
+ }
+ return getDefault().getBundle().getSymbolicName();
+ }
+
+ public static void log(Throwable t) {
+ Throwable top = t;
+ if (t instanceof DebugException) {
+ DebugException de = (DebugException) t;
+ IStatus status = de.getStatus();
+ if (status.getException() != null) {
+ top = status.getException();
+ }
+ }
+ log(new Status(IStatus.ERROR, getUniqueIdentifier(),
+ INTERNAL_ERROR, "Internal error in Drools Plugin: ", top));
+ }
+
+ public static void log(IStatus status) {
+ getDefault().getLog().log(status);
+ }
+
+ public Color getColor(String type) {
+ return (Color) colors.get(type);
+ }
+
+ public void setColor(String type, Color color) {
+ colors.put(type, color);
+ }
+
+ protected void initializeDefaultPreferences(IPreferenceStore store) {
+ store.setDefault(IDroolsConstants.BUILD_ALL, false);
+ store.setDefault(IDroolsConstants.EDITOR_FOLDING, true);
+ store.setDefault(IDroolsConstants.CACHE_PARSED_RULES, true);
+ }
+
+ public DRLInfo parseResource(IResource resource, boolean compile) throws DroolsParserException {
+ DRLInfo result = (DRLInfo) compiledRules.get(resource);
+ if (result == null && !compile) {
+ result = (DRLInfo) parsedRules.get(resource);
+ }
+ if (result != null) {
+ return result;
+ }
+ return generateParsedResource(resource, compile);
+ }
+
+ public DRLInfo parseResource(AbstractRuleEditor editor, boolean useUnsavedContent, boolean compile) throws DroolsParserException {
+ IResource resource = editor.getResource();
+ if (!editor.isDirty() || !useUnsavedContent) {
+ DRLInfo result = (DRLInfo) compiledRules.get(resource);
+ if (result == null && !compile) {
+ result = (DRLInfo) parsedRules.get(resource);
+ }
+ if (result != null) {
+ return result;
+ }
+ }
+ if (!editor.isDirty()) {
+ return generateParsedResource(editor.getContent(), resource, true, compile);
+ }
+ // TODO: can we cache result when using unsaved content as well?
+ return generateParsedResource(editor.getContent(), resource, !useUnsavedContent, compile);
+ }
+
+ public DRLInfo parseXLSResource(String content, IResource resource) throws DroolsParserException {
+ DRLInfo result = (DRLInfo) compiledRules.get(resource);
+ if (result != null) {
+ return result;
+ }
+ return generateParsedResource(content, resource, false, true);
+ }
+
+ public void invalidateResource(IResource resource) {
+ DRLInfo cached = (DRLInfo) compiledRules.remove(resource);
+ if (cached != null) {
+ RuleInfo[] ruleInfos = cached.getRuleInfos();
+ for (int i = 0; i < ruleInfos.length; i++) {
+ ruleInfoByClassNameMap.remove(ruleInfos[i].getClassName());
+ }
+ FunctionInfo[] functionInfos = cached.getFunctionInfos();
+ for (int i = 0; i < functionInfos.length; i++) {
+ functionInfoByClassNameMap.remove(functionInfos[i].getClassName());
+ }
+ }
+ parsedRules.remove(resource);
+ }
+
+ private DRLInfo generateParsedResource(IResource resource, boolean compile) throws DroolsParserException {
+ if (resource instanceof IFile) {
+ IFile file = (IFile) resource;
+ try {
+ String content = new String(Util.getResourceContentsAsCharArray(file));
+ return generateParsedResource(content, file, true, compile);
+ } catch (CoreException e) {
+ log(e);
+ }
+ }
+ return null;
+ }
+
+ private DRLInfo generateParsedResource(String content, IResource resource, boolean useCache, boolean compile) throws DroolsParserException {
+ useCache = useCache && useCachePreference;
+ DrlParser parser = new DrlParser();
+ try {
+ Reader dslReader = DSLAdapter.getDSLContent(content, resource);
+ ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
+ ClassLoader newLoader = DroolsBuilder.class.getClassLoader();
+ PackageBuilderConfiguration builder_configuration = new PackageBuilderConfiguration();
+ if (resource.getProject().getNature("org.eclipse.jdt.core.javanature") != null) {
+ IJavaProject project = JavaCore.create(resource.getProject());
+ newLoader = ProjectClassLoader.getProjectClassLoader(project);
+ String level = project.getOption(JavaCore.COMPILER_COMPLIANCE, true);
+ builder_configuration.setJavaLanguageLevel(level);
+ }
+ try {
+ builder_configuration.setClassLoader(newLoader);
+ Thread.currentThread().setContextClassLoader(newLoader);
+
+ // first parse the source
+ PackageDescr packageDescr = null;
+ if (useCache) {
+ DRLInfo cachedDrlInfo = (DRLInfo) parsedRules.get(resource);
+ if (cachedDrlInfo != null) {
+ packageDescr = cachedDrlInfo.getPackageDescr();
+ }
+ }
+ if (packageDescr == null) {
+ if (dslReader != null) {
+ packageDescr = parser.parse(content, dslReader);
+ } else {
+ packageDescr = parser.parse(content);
+ }
+ }
+ PackageBuilder builder = null;
+ DRLInfo result = null;
+ // compile parsed rules if necessary
+ if (compile && !parser.hasErrors()) {
+ builder = new PackageBuilder(builder_configuration);
+ builder.addPackage(packageDescr);
+ result = new DRLInfo(
+ resource.getProjectRelativePath().toString(),
+ packageDescr, parser.getErrors(),
+ builder.getPackage(), builder.getErrors());
+ } else {
+ result = new DRLInfo(
+ resource.getProjectRelativePath().toString(),
+ packageDescr, parser.getErrors());
+ }
+
+ // cache result
+ if (useCache) {
+ if (compile && !parser.hasErrors()) {
+ parsedRules.remove(resource);
+ compiledRules.put(resource, result);
+ RuleInfo[] ruleInfos = result.getRuleInfos();
+ for (int i = 0; i < ruleInfos.length; i++) {
+ ruleInfoByClassNameMap.put(ruleInfos[i].getClassName(), ruleInfos[i]);
+ }
+ FunctionInfo[] functionInfos = result.getFunctionInfos();
+ for (int i = 0; i < functionInfos.length; i++) {
+ functionInfoByClassNameMap.put(functionInfos[i].getClassName(), functionInfos[i]);
+ }
+ } else {
+ parsedRules.put(resource, result);
+ }
+ }
+ return result;
+ } finally {
+ Thread.currentThread().setContextClassLoader(oldLoader);
+ }
+ } catch (CoreException e) {
+ log(e);
+ }
+ return null;
+ }
+
+ public RuleInfo getRuleInfoByClass(String ruleClassName) {
+ return (RuleInfo) ruleInfoByClassNameMap.get(ruleClassName);
+ }
+
+ public FunctionInfo getFunctionInfoByClass(String functionClassName) {
+ return (FunctionInfo) functionInfoByClassNameMap.get(functionClassName);
+ }
+
+}
Deleted: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsIDEPlugin.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsIDEPlugin.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsIDEPlugin.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -1,365 +0,0 @@
-package org.drools.eclipse;
-/*
- * Copyright 2005 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.io.Reader;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.drools.compiler.DrlParser;
-import org.drools.compiler.DroolsParserException;
-import org.drools.compiler.PackageBuilder;
-import org.drools.compiler.PackageBuilderConfiguration;
-import org.drools.eclipse.DRLInfo.FunctionInfo;
-import org.drools.eclipse.DRLInfo.RuleInfo;
-import org.drools.eclipse.builder.DroolsBuilder;
-import org.drools.eclipse.builder.Util;
-import org.drools.eclipse.editors.AbstractRuleEditor;
-import org.drools.eclipse.editors.DRLRuleEditor;
-import org.drools.eclipse.editors.DSLAdapter;
-import org.drools.eclipse.preferences.IDroolsConstants;
-import org.drools.eclipse.util.ProjectClassLoader;
-import org.drools.lang.descr.PackageDescr;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- *
- * @author <a href="mailto:kris_verlaenen at hotmail.com">kris verlaenen </a>
- */
-public class DroolsIDEPlugin extends AbstractUIPlugin {
-
- public static final int INTERNAL_ERROR = 120;
- public static final String PLUGIN_ID = "org.drools.eclipse";
- public static final String BUILD_RESULT_PACKAGE = "Package";
- public static final String BUILD_RESULT_PACKAGE_DESCR = "PackageDescr";
-
- //The shared instance.
- private static DroolsIDEPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
- private Map colors = new HashMap();
- private Map parsedRules = new HashMap();
- private Map compiledRules = new HashMap();
- private Map ruleInfoByClassNameMap = new HashMap();
- private Map functionInfoByClassNameMap = new HashMap();
- private boolean useCachePreference;
-
- /**
- * The constructor.
- */
- public DroolsIDEPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- IPreferenceStore preferenceStore = getPreferenceStore();
- useCachePreference = preferenceStore.getBoolean(IDroolsConstants.CACHE_PARSED_RULES);
- preferenceStore.addPropertyChangeListener(new IPropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent event) {
- if (IDroolsConstants.CACHE_PARSED_RULES.equals(event.getProperty())) {
- useCachePreference = ((Boolean) event.getNewValue()).booleanValue();
- if (!useCachePreference) {
- parsedRules.clear();
- compiledRules.clear();
- ruleInfoByClassNameMap.clear();
- functionInfoByClassNameMap.clear();
- }
- }
- }
- });
-
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- resourceBundle = null;
- parsedRules = null;
- compiledRules = null;
- Iterator iterator = colors.values().iterator();
- while (iterator.hasNext()) {
- ((Color) iterator.next()).dispose();
- }
- }
-
- /**
- * Returns the shared instance.
- */
- public static DroolsIDEPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = DroolsIDEPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- try {
- if (resourceBundle == null)
- resourceBundle = ResourceBundle.getBundle("droolsIDE.DroolsIDEPluginResources");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- return resourceBundle;
- }
-
- /**
- * Returns an image descriptor for the image file at the given
- * plug-in relative path.
- * Uses the plug ins image registry to "cache" it.
- *
- * @param path the path
- * @return the image descriptor
- */
- public static ImageDescriptor getImageDescriptor(String path) {
-
- DroolsIDEPlugin plugin = getDefault();
- ImageRegistry reg = plugin.getImageRegistry();
- ImageDescriptor des = reg.getDescriptor( path );
- if (des == null) {
- des = AbstractUIPlugin.imageDescriptorFromPlugin("org.drools.eclipse", path);
- reg.put( path, des );
- }
- return des;
- }
-
- public static String getUniqueIdentifier() {
- if (getDefault() == null) {
- return PLUGIN_ID;
- }
- return getDefault().getBundle().getSymbolicName();
- }
-
- public static void log(Throwable t) {
- Throwable top = t;
- if (t instanceof DebugException) {
- DebugException de = (DebugException) t;
- IStatus status = de.getStatus();
- if (status.getException() != null) {
- top = status.getException();
- }
- }
- log(new Status(IStatus.ERROR, getUniqueIdentifier(),
- INTERNAL_ERROR, "Internal error in Drools Plugin: ", top));
- }
-
- public static void log(IStatus status) {
- getDefault().getLog().log(status);
- }
-
- public Color getColor(String type) {
- return (Color) colors.get(type);
- }
-
- public void setColor(String type, Color color) {
- colors.put(type, color);
- }
-
- protected void initializeDefaultPreferences(IPreferenceStore store) {
- store.setDefault(IDroolsConstants.BUILD_ALL, false);
- store.setDefault(IDroolsConstants.EDITOR_FOLDING, true);
- store.setDefault(IDroolsConstants.CACHE_PARSED_RULES, true);
- }
-
- public DRLInfo parseResource(IResource resource, boolean compile) throws DroolsParserException {
- DRLInfo result = (DRLInfo) compiledRules.get(resource);
- if (result == null && !compile) {
- result = (DRLInfo) parsedRules.get(resource);
- }
- if (result != null) {
- return result;
- }
- return generateParsedResource(resource, compile);
- }
-
- public DRLInfo parseResource(AbstractRuleEditor editor, boolean useUnsavedContent, boolean compile) throws DroolsParserException {
- IResource resource = editor.getResource();
- if (!editor.isDirty() || !useUnsavedContent) {
- DRLInfo result = (DRLInfo) compiledRules.get(resource);
- if (result == null && !compile) {
- result = (DRLInfo) parsedRules.get(resource);
- }
- if (result != null) {
- return result;
- }
- }
- if (!editor.isDirty()) {
- return generateParsedResource(editor.getContent(), resource, true, compile);
- }
- // TODO: can we cache result when using unsaved content as well?
- return generateParsedResource(editor.getContent(), resource, !useUnsavedContent, compile);
- }
-
- public DRLInfo parseXLSResource(String content, IResource resource) throws DroolsParserException {
- DRLInfo result = (DRLInfo) compiledRules.get(resource);
- if (result != null) {
- return result;
- }
- return generateParsedResource(content, resource, false, true);
- }
-
- public void invalidateResource(IResource resource) {
- DRLInfo cached = (DRLInfo) compiledRules.remove(resource);
- if (cached != null) {
- RuleInfo[] ruleInfos = cached.getRuleInfos();
- for (int i = 0; i < ruleInfos.length; i++) {
- ruleInfoByClassNameMap.remove(ruleInfos[i].getClassName());
- }
- FunctionInfo[] functionInfos = cached.getFunctionInfos();
- for (int i = 0; i < functionInfos.length; i++) {
- functionInfoByClassNameMap.remove(functionInfos[i].getClassName());
- }
- }
- parsedRules.remove(resource);
- }
-
- private DRLInfo generateParsedResource(IResource resource, boolean compile) throws DroolsParserException {
- if (resource instanceof IFile) {
- IFile file = (IFile) resource;
- try {
- String content = new String(Util.getResourceContentsAsCharArray(file));
- return generateParsedResource(content, file, true, compile);
- } catch (CoreException e) {
- log(e);
- }
- }
- return null;
- }
-
- private DRLInfo generateParsedResource(String content, IResource resource, boolean useCache, boolean compile) throws DroolsParserException {
- useCache = useCache && useCachePreference;
- DrlParser parser = new DrlParser();
- try {
- Reader dslReader = DSLAdapter.getDSLContent(content, resource);
- ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
- ClassLoader newLoader = DroolsBuilder.class.getClassLoader();
- PackageBuilderConfiguration builder_configuration = new PackageBuilderConfiguration();
- if (resource.getProject().getNature("org.eclipse.jdt.core.javanature") != null) {
- IJavaProject project = JavaCore.create(resource.getProject());
- newLoader = ProjectClassLoader.getProjectClassLoader(project);
- String level = project.getOption(JavaCore.COMPILER_COMPLIANCE, true);
- builder_configuration.setJavaLanguageLevel(level);
- }
- try {
- builder_configuration.setClassLoader(newLoader);
- Thread.currentThread().setContextClassLoader(newLoader);
-
- // first parse the source
- PackageDescr packageDescr = null;
- if (useCache) {
- DRLInfo cachedDrlInfo = (DRLInfo) parsedRules.get(resource);
- if (cachedDrlInfo != null) {
- packageDescr = cachedDrlInfo.getPackageDescr();
- }
- }
- if (packageDescr == null) {
- if (dslReader != null) {
- packageDescr = parser.parse(content, dslReader);
- } else {
- packageDescr = parser.parse(content);
- }
- }
- PackageBuilder builder = null;
- DRLInfo result = null;
- // compile parsed rules if necessary
- if (compile && !parser.hasErrors()) {
- builder = new PackageBuilder(builder_configuration);
- builder.addPackage(packageDescr);
- result = new DRLInfo(
- resource.getProjectRelativePath().toString(),
- packageDescr, parser.getErrors(),
- builder.getPackage(), builder.getErrors());
- } else {
- result = new DRLInfo(
- resource.getProjectRelativePath().toString(),
- packageDescr, parser.getErrors());
- }
-
- // cache result
- if (useCache) {
- if (compile && !parser.hasErrors()) {
- parsedRules.remove(resource);
- compiledRules.put(resource, result);
- RuleInfo[] ruleInfos = result.getRuleInfos();
- for (int i = 0; i < ruleInfos.length; i++) {
- ruleInfoByClassNameMap.put(ruleInfos[i].getClassName(), ruleInfos[i]);
- }
- FunctionInfo[] functionInfos = result.getFunctionInfos();
- for (int i = 0; i < functionInfos.length; i++) {
- functionInfoByClassNameMap.put(functionInfos[i].getClassName(), functionInfos[i]);
- }
- } else {
- parsedRules.put(resource, result);
- }
- }
- return result;
- } finally {
- Thread.currentThread().setContextClassLoader(oldLoader);
- }
- } catch (CoreException e) {
- log(e);
- }
- return null;
- }
-
- public RuleInfo getRuleInfoByClass(String ruleClassName) {
- return (RuleInfo) ruleInfoByClassNameMap.get(ruleClassName);
- }
-
- public FunctionInfo getFunctionInfoByClass(String functionClassName) {
- return (FunctionInfo) functionInfoByClassNameMap.get(functionClassName);
- }
-
-}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsPluginImages.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsPluginImages.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsPluginImages.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -57,7 +57,7 @@
private static ImageRegistry imageRegistry;
private static final String PATH_SUFFIX = "/icons/";
private static final URL ICON_BASE_URL =
- DroolsIDEPlugin.getDefault().getBundle().getEntry(PATH_SUFFIX);
+ DroolsEclipsePlugin.getDefault().getBundle().getEntry(PATH_SUFFIX);
private static void declareImages() {
declareRegistryImage(IMG_LOGICAL, "logical_structure.gif");
@@ -97,7 +97,7 @@
try {
desc= ImageDescriptor.createFromURL(makeIconFileURL(path));
} catch (MalformedURLException e) {
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
}
imageRegistry.put(key, desc);
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/action/ConvertToDroolsProjectAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/action/ConvertToDroolsProjectAction.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/action/ConvertToDroolsProjectAction.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -1,6 +1,6 @@
package org.drools.eclipse.action;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.builder.DroolsBuilder;
import org.drools.eclipse.wizard.project.NewDroolsProjectWizard;
import org.drools.util.ArrayUtils;
@@ -31,7 +31,7 @@
addDroolsBuilder(javaProject, null);
NewDroolsProjectWizard.addDroolsLibraries(javaProject, null);
} catch (Throwable t) {
- DroolsIDEPlugin.log(t);
+ DroolsEclipsePlugin.log(t);
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/builder/DroolsBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/builder/DroolsBuilder.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/builder/DroolsBuilder.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -18,7 +18,7 @@
import org.drools.decisiontable.InputType;
import org.drools.decisiontable.SpreadsheetCompiler;
import org.drools.eclipse.DRLInfo;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.preferences.IDroolsConstants;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
@@ -83,7 +83,7 @@
protected void incrementalBuild(IResourceDelta delta,
IProgressMonitor monitor) throws CoreException {
- boolean buildAll = DroolsIDEPlugin.getDefault().getPreferenceStore().getBoolean(IDroolsConstants.BUILD_ALL);
+ boolean buildAll = DroolsEclipsePlugin.getDefault().getPreferenceStore().getBoolean(IDroolsConstants.BUILD_ALL);
if (buildAll) {
// to make sure that all rules are checked when a java file is changed
fullBuild(monitor);
@@ -148,7 +148,7 @@
List markers = new ArrayList();
try {
DRLInfo drlInfo =
- DroolsIDEPlugin.getDefault().parseResource(file, true);
+ DroolsEclipsePlugin.getDefault().parseResource(file, true);
//parser errors
markParseErrors(markers, drlInfo.getParserErrors());
markOtherErrors(markers, drlInfo.getBuilderErrors());
@@ -175,7 +175,7 @@
SpreadsheetCompiler converter = new SpreadsheetCompiler();
String drl = converter.compile(file.getContents(), InputType.XLS);
DRLInfo drlInfo =
- DroolsIDEPlugin.getDefault().parseXLSResource(drl, file);
+ DroolsEclipsePlugin.getDefault().parseXLSResource(drl, file);
// parser errors
markParseErrors(markers, drlInfo.getParserErrors());
markOtherErrors(markers, drlInfo.getBuilderErrors());
@@ -271,7 +271,7 @@
};
res.getWorkspace().run(r, null, IWorkspace.AVOID_UPDATE, null);
} catch (CoreException e) {
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
}
}
@@ -283,7 +283,7 @@
IResource.DEPTH_INFINITE);
}
} catch (CoreException e) {
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/builder/IDroolsModelMarker.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/builder/IDroolsModelMarker.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/builder/IDroolsModelMarker.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -1,6 +1,6 @@
package org.drools.eclipse.builder;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
/**
* The drools problem marker id.
@@ -9,7 +9,7 @@
*/
public interface IDroolsModelMarker {
- public static final String DROOLS_MODEL_PROBLEM_MARKER = DroolsIDEPlugin.PLUGIN_ID
+ public static final String DROOLS_MODEL_PROBLEM_MARKER = DroolsEclipsePlugin.PLUGIN_ID
+ ".problem";
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/builder/Util.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/builder/Util.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/builder/Util.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -6,7 +6,7 @@
import java.io.InputStreamReader;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
@@ -36,7 +36,7 @@
try {
return getInputStreamAsCharArray(stream, -1, encoding);
} catch (IOException e) {
- throw new CoreException(new Status(IStatus.ERROR, DroolsIDEPlugin.PLUGIN_ID, IStatus.ERROR, "IOException", e));
+ throw new CoreException(new Status(IStatus.ERROR, DroolsEclipsePlugin.PLUGIN_ID, IStatus.ERROR, "IOException", e));
} finally {
try {
stream.close();
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/core/ui/FilterActionGroup.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/core/ui/FilterActionGroup.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/core/ui/FilterActionGroup.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -1,6 +1,6 @@
package org.drools.eclipse.core.ui;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.DroolsPluginImages;
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.preference.IPreferenceStore;
@@ -39,7 +39,7 @@
}
private FilterAction addFilterForType(int filterType, String tooltip, String imageDescriptorKey) {
- boolean filterEnabled = DroolsIDEPlugin.getDefault()
+ boolean filterEnabled = DroolsEclipsePlugin.getDefault()
.getPreferenceStore().getBoolean(getPreferenceKey(filterType));
if (filterEnabled) {
filter.addFilter(filterType);
@@ -66,7 +66,7 @@
int filterProperty= propertyKeys[i];
boolean set= propertyValues[i];
- IPreferenceStore store = DroolsIDEPlugin.getDefault().getPreferenceStore();
+ IPreferenceStore store = DroolsEclipsePlugin.getDefault().getPreferenceStore();
boolean found = false;
for (int j= 0; j < filterActions.length; j++) {
int currProperty= filterActions[j].getFilterType();
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/AgendaLogicalStructureDelegate.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/AgendaLogicalStructureDelegate.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/AgendaLogicalStructureDelegate.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.model.ILogicalStructureTypeDelegate;
@@ -43,7 +43,7 @@
}
return false;
} catch (DebugException e) {
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
return false;
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/AgendaViewContentProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/AgendaViewContentProvider.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/AgendaViewContentProvider.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.core.model.IVariable;
@@ -52,7 +52,7 @@
return variables;
}
} catch (DebugException e) {
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
return new Object[0];
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/ApplicationDataViewContentProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/ApplicationDataViewContentProvider.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/ApplicationDataViewContentProvider.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.core.model.IVariable;
@@ -51,7 +51,7 @@
return variables;
}
} catch (DebugException e) {
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
return new Object[0];
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/AuditView.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/AuditView.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/AuditView.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -14,7 +14,7 @@
import org.drools.audit.event.ActivationLogEvent;
import org.drools.audit.event.LogEvent;
import org.drools.audit.event.ObjectLogEvent;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.DroolsPluginImages;
import org.drools.eclipse.debug.actions.DeleteLogAction;
import org.drools.eclipse.debug.actions.OpenLogAction;
@@ -167,7 +167,7 @@
setLogFile(null);
getViewer().setInput(null);
} catch (Throwable t) {
- DroolsIDEPlugin.log(t);
+ DroolsEclipsePlugin.log(t);
getViewer().setInput(null);
}
}
@@ -182,7 +182,7 @@
refresh();
} catch (Throwable t) {
t.printStackTrace();
- DroolsIDEPlugin.log(t);
+ DroolsEclipsePlugin.log(t);
}
}
}
@@ -309,10 +309,10 @@
Event selected = getSelectedEvent();
if (selected != null) {
if (element.equals(selected.getCauseEvent())) {
- Color color = DroolsIDEPlugin.getDefault().getColor(CAUSE_EVENT_COLOR);
+ Color color = DroolsEclipsePlugin.getDefault().getColor(CAUSE_EVENT_COLOR);
if (color == null) {
color = new Color(getControl().getDisplay(), 0, 255, 0);
- DroolsIDEPlugin.getDefault().setColor(CAUSE_EVENT_COLOR, color);
+ DroolsEclipsePlugin.getDefault().setColor(CAUSE_EVENT_COLOR, color);
}
return color;
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/DebugUtil.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/DebugUtil.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/DebugUtil.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -1,6 +1,6 @@
package org.drools.eclipse.debug;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
@@ -36,7 +36,7 @@
public static final int INFO_EVALUATION_STACK_FRAME = 111;
private static IStatus fgNeedStackFrame = new Status(IStatus.INFO,
- DroolsIDEPlugin.getUniqueIdentifier(), INFO_EVALUATION_STACK_FRAME,
+ DroolsEclipsePlugin.getUniqueIdentifier(), INFO_EVALUATION_STACK_FRAME,
"Provides thread context for an evaluation", null);
private static IStatusHandler fgStackFrameProvider;
@@ -100,7 +100,7 @@
return evaluationBlock.evaluate(expression);
} catch (CoreException e) {
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
}
return null;
}
@@ -176,7 +176,7 @@
message += errorMessages[i] + "\n";
}
throw new DebugException(new Status(IStatus.ERROR,
- DroolsIDEPlugin.PLUGIN_ID, DroolsIDEPlugin.INTERNAL_ERROR,
+ DroolsEclipsePlugin.PLUGIN_ID, DroolsEclipsePlugin.INTERNAL_ERROR,
"Error when compiling snippet " + snippet + ": " + message, null));
}
fResult = null;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/DroolsDebugEventHandlerView.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/DroolsDebugEventHandlerView.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/DroolsDebugEventHandlerView.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -1,6 +1,6 @@
package org.drools.eclipse.debug;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.debug.actions.ShowLogicalStructureAction;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.model.IStackFrame;
@@ -73,7 +73,7 @@
input = value;
}
} catch (Throwable t) {
- DroolsIDEPlugin.log(t);
+ DroolsEclipsePlugin.log(t);
}
}
// else get selected thread and determine if any of the stack frames
@@ -97,7 +97,7 @@
}
}
} catch (Throwable t) {
- DroolsIDEPlugin.log(t);
+ DroolsEclipsePlugin.log(t);
}
}
}
@@ -253,7 +253,7 @@
.get(IDebugUIConstants.PREF_CHANGED_DEBUG_ELEMENT_COLOR);
}
} catch (DebugException e) {
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
}
}
return null;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/DroolsDebugViewContentProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/DroolsDebugViewContentProvider.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/DroolsDebugViewContentProvider.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -6,7 +6,7 @@
import java.util.List;
import java.util.Map;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.DebugPlugin;
@@ -88,7 +88,7 @@
return ((IStackFrame)element).hasVariables();
}
} catch (DebugException e) {
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
return false;
}
return false;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/WorkingMemoryViewContentProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/WorkingMemoryViewContentProvider.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/WorkingMemoryViewContentProvider.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.model.IDebugTarget;
@@ -56,7 +56,7 @@
return variables;
}
} catch (DebugException e) {
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
return new Object[0];
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/actions/DeleteLogAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/actions/DeleteLogAction.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/actions/DeleteLogAction.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -1,7 +1,7 @@
package org.drools.eclipse.debug.actions;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.DroolsPluginImages;
import org.drools.eclipse.debug.AuditView;
import org.eclipse.jface.action.Action;
@@ -23,7 +23,7 @@
setToolTipText("Clear Log");
setImageDescriptor(DroolsPluginImages.getImageDescriptor(DroolsPluginImages.DELETE_LOG));
setDisabledImageDescriptor(DroolsPluginImages.getImageDescriptor(DroolsPluginImages.DELETE_LOG_DISABLED));
- setId(DroolsIDEPlugin.getUniqueIdentifier() + ".ClearLogAction");
+ setId(DroolsEclipsePlugin.getUniqueIdentifier() + ".ClearLogAction");
}
public void run() {
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/actions/OpenLogAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/actions/OpenLogAction.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/actions/OpenLogAction.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -1,7 +1,7 @@
package org.drools.eclipse.debug.actions;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.DroolsPluginImages;
import org.drools.eclipse.debug.AuditView;
import org.eclipse.jface.action.Action;
@@ -23,7 +23,7 @@
this.view = view;
setToolTipText("Open Log");
setImageDescriptor(DroolsPluginImages.getImageDescriptor(DroolsPluginImages.OPEN_LOG));
- setId(DroolsIDEPlugin.getUniqueIdentifier() + ".OpenLogAction");
+ setId(DroolsEclipsePlugin.getUniqueIdentifier() + ".OpenLogAction");
}
public void run() {
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/actions/RefreshLogAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/actions/RefreshLogAction.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/actions/RefreshLogAction.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -1,7 +1,7 @@
package org.drools.eclipse.debug.actions;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.DroolsPluginImages;
import org.drools.eclipse.debug.AuditView;
import org.eclipse.jface.action.Action;
@@ -23,7 +23,7 @@
setToolTipText("Refresh Log");
setImageDescriptor(DroolsPluginImages.getImageDescriptor(DroolsPluginImages.REFRESH_LOG));
setDisabledImageDescriptor(DroolsPluginImages.getImageDescriptor(DroolsPluginImages.REFRESH_LOG_DISABLED));
- setId(DroolsIDEPlugin.getUniqueIdentifier() + ".RefreshLogAction");
+ setId(DroolsEclipsePlugin.getUniqueIdentifier() + ".RefreshLogAction");
}
public void run() {
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/actions/ShowEventCauseAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/actions/ShowEventCauseAction.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/actions/ShowEventCauseAction.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -1,7 +1,7 @@
package org.drools.eclipse.debug.actions;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.debug.AuditView;
import org.drools.eclipse.debug.AuditView.Event;
import org.eclipse.jface.action.Action;
@@ -21,7 +21,7 @@
this.view = view;
setToolTipText("Show Cause");
setText("Show Cause");
- setId(DroolsIDEPlugin.getUniqueIdentifier() + ".ShowEventCause");
+ setId(DroolsEclipsePlugin.getUniqueIdentifier() + ".ShowEventCause");
}
public void run() {
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/actions/ShowLogicalStructureAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/actions/ShowLogicalStructureAction.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/actions/ShowLogicalStructureAction.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -1,7 +1,7 @@
package org.drools.eclipse.debug.actions;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.DroolsPluginImages;
import org.drools.eclipse.debug.DroolsDebugEventHandlerView;
import org.eclipse.jface.action.Action;
@@ -24,7 +24,7 @@
setToolTipText("Show Logical Structure");
setImageDescriptor(DroolsPluginImages.getImageDescriptor(DroolsPluginImages.IMG_LOGICAL));
setDisabledImageDescriptor(DroolsPluginImages.getImageDescriptor(DroolsPluginImages.IMG_LOGICAL_DISABLED));
- setId(DroolsIDEPlugin.getUniqueIdentifier() + ".ShowLogicalStructureAction");
+ setId(DroolsEclipsePlugin.getUniqueIdentifier() + ".ShowLogicalStructureAction");
}
public void run() {
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/core/DroolsDebugModel.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/core/DroolsDebugModel.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/core/DroolsDebugModel.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -1,6 +1,6 @@
package org.drools.eclipse.debug.core;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.core.resources.IWorkspaceRunnable;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
@@ -31,7 +31,7 @@
try {
ResourcesPlugin.getWorkspace().run(r, null, 0, null);
} catch (CoreException exc) {
- DroolsIDEPlugin.log(exc);
+ DroolsEclipsePlugin.log(exc);
}
return target[0];
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/core/DroolsDebugTarget.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/core/DroolsDebugTarget.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/core/DroolsDebugTarget.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -5,7 +5,7 @@
import java.util.Iterator;
import java.util.List;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.core.resources.IMarkerDelta;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.DebugEvent;
@@ -55,7 +55,7 @@
} catch (Throwable t) {
// Exception will be thrown when trying to use breakpoint
// on drl that is incorrect (cannot be parsed or compiled)
- DroolsIDEPlugin.log(t);
+ DroolsEclipsePlugin.log(t);
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/core/DroolsLineBreakpoint.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/core/DroolsLineBreakpoint.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/core/DroolsLineBreakpoint.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -4,7 +4,7 @@
import java.util.Map;
import org.drools.eclipse.DRLInfo;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.DRLInfo.FunctionInfo;
import org.drools.eclipse.DRLInfo.RuleInfo;
import org.eclipse.core.resources.IMarker;
@@ -64,7 +64,7 @@
private String getRuleClassName(IResource resource, int lineNumber) throws CoreException {
try {
- DRLInfo drlInfo = DroolsIDEPlugin.getDefault().parseResource(resource, true);
+ DRLInfo drlInfo = DroolsEclipsePlugin.getDefault().parseResource(resource, true);
if (drlInfo != null) {
RuleInfo ruleInfo = drlInfo.getRuleInfo(lineNumber);
if (ruleInfo != null) {
@@ -75,17 +75,17 @@
return functionInfo.getClassName();
}
}
- throw new CoreException(new Status(IStatus.ERROR, DroolsIDEPlugin.getUniqueIdentifier(), 0,
+ throw new CoreException(new Status(IStatus.ERROR, DroolsEclipsePlugin.getUniqueIdentifier(), 0,
"Cannot determine ruleClassName for " + resource + " " + lineNumber, null));
} catch (Throwable t) {
- throw new CoreException(new Status(IStatus.ERROR, DroolsIDEPlugin.getUniqueIdentifier(), 0,
+ throw new CoreException(new Status(IStatus.ERROR, DroolsEclipsePlugin.getUniqueIdentifier(), 0,
"Cannot determine ruleClassName for " + resource + " " + lineNumber, t));
}
}
private int getRuleLineNumber(IResource resource, int lineNumber) throws CoreException {
try {
- DRLInfo drlInfo = DroolsIDEPlugin.getDefault().parseResource(resource, true);
+ DRLInfo drlInfo = DroolsEclipsePlugin.getDefault().parseResource(resource, true);
if (drlInfo != null) {
RuleInfo ruleInfo = drlInfo.getRuleInfo(lineNumber);
if (ruleInfo != null) {
@@ -100,10 +100,10 @@
+ (lineNumber - functionInfo.getDrlLineNumber());
}
}
- throw new CoreException(new Status(IStatus.ERROR, DroolsIDEPlugin.getUniqueIdentifier(), 0,
+ throw new CoreException(new Status(IStatus.ERROR, DroolsEclipsePlugin.getUniqueIdentifier(), 0,
"Cannot determine ruleLineNumber for " + resource + " " + lineNumber, null));
} catch(Throwable t) {
- throw new CoreException(new Status(IStatus.ERROR, DroolsIDEPlugin.getUniqueIdentifier(), 0,
+ throw new CoreException(new Status(IStatus.ERROR, DroolsEclipsePlugin.getUniqueIdentifier(), 0,
"Cannot determine ruleLineNumber for " + resource + " " + lineNumber, t));
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/core/DroolsLineBreakpointMarkerUpdater.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/core/DroolsLineBreakpointMarkerUpdater.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/core/DroolsLineBreakpointMarkerUpdater.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -1,6 +1,6 @@
package org.drools.eclipse.debug.core;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.core.resources.IMarker;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.Position;
@@ -52,7 +52,7 @@
int drlLineNumber = document.getLineOfOffset(position.getOffset()) + 1;
marker.setAttribute(IDroolsDebugConstants.DRL_LINE_NUMBER, drlLineNumber);
} catch (Throwable t) {
- DroolsIDEPlugin.log(t);
+ DroolsEclipsePlugin.log(t);
}
}
return true;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/core/DroolsStackFrame.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/core/DroolsStackFrame.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/core/DroolsStackFrame.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -6,7 +6,7 @@
import java.util.Iterator;
import java.util.List;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.DRLInfo.FunctionInfo;
import org.drools.eclipse.DRLInfo.RuleInfo;
import org.eclipse.core.runtime.IStatus;
@@ -64,7 +64,7 @@
return true;
}
} catch (DebugException exc) {
- DroolsIDEPlugin.log(exc);
+ DroolsEclipsePlugin.log(exc);
}
return false;
}
@@ -75,20 +75,20 @@
String signature = getSignature();
String type = getDeclaringTypeName();
if ("consequence".equals(methodName) && signature.startsWith(CONSEQUENCE_SIGNATURE)) {
- return DroolsIDEPlugin.getDefault().getRuleInfoByClass(type);
+ return DroolsEclipsePlugin.getDefault().getRuleInfoByClass(type);
}
} catch (DebugException exc) {
- DroolsIDEPlugin.log(exc);
+ DroolsEclipsePlugin.log(exc);
}
return null;
}
public FunctionInfo getExecutingFunctionInfo() {
try {
- return DroolsIDEPlugin.getDefault()
+ return DroolsEclipsePlugin.getDefault()
.getFunctionInfoByClass(getDeclaringTypeName());
} catch (DebugException exc) {
- DroolsIDEPlugin.log(exc);
+ DroolsEclipsePlugin.log(exc);
}
return null;
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/dsl/editor/DSLEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/dsl/editor/DSLEditor.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/dsl/editor/DSLEditor.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -9,7 +9,7 @@
import java.util.Iterator;
import java.util.List;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.builder.IDroolsModelMarker;
import org.drools.lang.dsl.DSLMappingEntry;
import org.drools.lang.dsl.DSLMappingFile;
@@ -130,7 +130,7 @@
IWorkspace.AVOID_UPDATE,
null );
} catch ( CoreException e ) {
- DroolsIDEPlugin.log( e );
+ DroolsEclipsePlugin.log( e );
}
}
@@ -142,7 +142,7 @@
IResource.DEPTH_INFINITE );
}
} catch ( CoreException e ) {
- DroolsIDEPlugin.log( e );
+ DroolsEclipsePlugin.log( e );
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/AbstractRuleEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/AbstractRuleEditor.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/AbstractRuleEditor.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -9,7 +9,7 @@
import org.drools.compiler.DroolsParserException;
import org.drools.eclipse.DRLInfo;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.debug.core.IDroolsDebugConstants;
import org.drools.eclipse.editors.outline.RuleContentOutlinePage;
import org.drools.eclipse.editors.scanners.RuleEditorMessages;
@@ -226,7 +226,7 @@
try {
javaProject.newEvaluationContext().codeComplete(packageName + ".", packageName.length() + 1, requestor);
} catch (Throwable t) {
- DroolsIDEPlugin.log(t);
+ DroolsEclipsePlugin.log(t);
}
}
}
@@ -254,7 +254,7 @@
try {
javaProject.newEvaluationContext().codeComplete(className + ".", className.length() + 1, requestor);
} catch (Throwable t) {
- DroolsIDEPlugin.log(t);
+ DroolsEclipsePlugin.log(t);
}
}
}
@@ -278,7 +278,7 @@
public void doSave(IProgressMonitor monitor) {
// invalidate cached parsed rules
- DroolsIDEPlugin.getDefault().invalidateResource(getResource());
+ DroolsEclipsePlugin.getDefault().invalidateResource(getResource());
// save
super.doSave(monitor);
// update outline view
@@ -304,13 +304,13 @@
IDocument document = getDocumentProvider().getDocument(getEditorInput());
selectAndReveal(document.getLineOffset(line), document.getLineLength(line));
} catch(BadLocationException exc) {
- DroolsIDEPlugin.log(exc);
+ DroolsEclipsePlugin.log(exc);
}
} else {
super.gotoMarker(marker);
}
} catch (CoreException exc) {
- DroolsIDEPlugin.log(exc);
+ DroolsEclipsePlugin.log(exc);
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DRLAnnotationModel.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DRLAnnotationModel.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DRLAnnotationModel.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -1,6 +1,6 @@
package org.drools.eclipse.editors;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.debug.core.IDroolsDebugConstants;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IResource;
@@ -27,7 +27,7 @@
return super.createPositionFromMarker(marker);
}
} catch (CoreException exc) {
- DroolsIDEPlugin.log(exc);
+ DroolsEclipsePlugin.log(exc);
return null;
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DRLReconcilingStrategy.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DRLReconcilingStrategy.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DRLReconcilingStrategy.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -6,7 +6,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.preferences.IDroolsConstants;
import org.eclipse.core.resources.IFile;
import org.eclipse.jface.preference.IPreferenceStore;
@@ -38,7 +38,7 @@
public DRLReconcilingStrategy(ISourceViewer sourceViewer, final AbstractRuleEditor editor) {
this.sourceViewer = sourceViewer;
this.editor = editor;
- IPreferenceStore preferenceStore = DroolsIDEPlugin.getDefault().getPreferenceStore();
+ IPreferenceStore preferenceStore = DroolsEclipsePlugin.getDefault().getPreferenceStore();
folding = preferenceStore.getBoolean(IDroolsConstants.EDITOR_FOLDING);
preferenceStore.addPropertyChangeListener(new IPropertyChangeListener() {
public void propertyChange(PropertyChangeEvent event) {
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DRLRuleEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DRLRuleEditor.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DRLRuleEditor.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -7,7 +7,7 @@
import org.drools.compiler.DroolsParserException;
import org.drools.eclipse.DRLInfo;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.editors.outline.RuleContentOutlinePage;
import org.drools.eclipse.preferences.IDroolsConstants;
import org.drools.lang.descr.FactTemplateDescr;
@@ -43,7 +43,7 @@
protected void loadImportsAndFunctions() {
try {
- DRLInfo drlInfo = DroolsIDEPlugin.getDefault().parseResource(this, true, false);
+ DRLInfo drlInfo = DroolsEclipsePlugin.getDefault().parseResource(this, true, false);
PackageDescr descr = drlInfo.getPackageDescr();
// package
this.packageName = drlInfo.getPackageName();
@@ -90,7 +90,7 @@
templates.put(template.getName(), template);
}
} catch (DroolsParserException e) {
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DRLRuleEditor2.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DRLRuleEditor2.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DRLRuleEditor2.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -18,7 +18,7 @@
import java.lang.reflect.InvocationTargetException;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.editors.rete.ReteViewer;
import org.drools.eclipse.editors.rete.model.ReteGraph;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -110,7 +110,7 @@
} );
} catch ( PartInitException e ) {
- DroolsIDEPlugin.log( e );
+ DroolsEclipsePlugin.log( e );
}
}
@@ -282,7 +282,7 @@
}
private void handleError(Throwable t) {
- DroolsIDEPlugin.log( t );
+ DroolsEclipsePlugin.log( t );
Throwable cause = t.getCause();
if ( cause == null ) {
cause = t;
@@ -292,7 +292,7 @@
message = "Uncategorized Error!";
}
IStatus status = new Status( IStatus.ERROR,
- DroolsIDEPlugin.getUniqueIdentifier(),
+ DroolsEclipsePlugin.getUniqueIdentifier(),
-1,
message,
null);
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DroolsLineBreakpointAdapter.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DroolsLineBreakpointAdapter.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DroolsLineBreakpointAdapter.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -1,7 +1,7 @@
package org.drools.eclipse.editors;
import org.drools.eclipse.DRLInfo;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.DRLInfo.FunctionInfo;
import org.drools.eclipse.DRLInfo.RuleInfo;
import org.drools.eclipse.debug.core.DroolsLineBreakpoint;
@@ -25,7 +25,7 @@
ITextSelection textSelection = (ITextSelection) selection;
int lineNumber = textSelection.getStartLine();
try {
- DRLInfo drlInfo = DroolsIDEPlugin.getDefault().parseResource(resource, false);
+ DRLInfo drlInfo = DroolsEclipsePlugin.getDefault().parseResource(resource, false);
if (drlInfo != null) {
RuleInfo ruleInfo = drlInfo.getRuleInfo(lineNumber);
if (ruleInfo != null) {
@@ -41,7 +41,7 @@
}
}
} catch (Throwable t) {
- DroolsIDEPlugin.log(t);
+ DroolsEclipsePlugin.log(t);
}
}
return false;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DroolsPairMatcher.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DroolsPairMatcher.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DroolsPairMatcher.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -2,7 +2,7 @@
import java.util.Stack;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
@@ -30,7 +30,7 @@
}
}
} catch (BadLocationException e) {
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
}
return null;
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/DefaultCompletionProcessor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/DefaultCompletionProcessor.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/DefaultCompletionProcessor.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -8,7 +8,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.DroolsPluginImages;
import org.drools.eclipse.editors.AbstractRuleEditor;
import org.drools.eclipse.editors.DRLRuleEditor;
@@ -84,7 +84,7 @@
}
return props;
} catch (Throwable t) {
- DroolsIDEPlugin.log(t);
+ DroolsEclipsePlugin.log(t);
}
return null;
}
@@ -127,7 +127,7 @@
try {
javaProject.newEvaluationContext().codeComplete(classNameStart, classNameStart.length(), requestor);
} catch (Throwable t) {
- DroolsIDEPlugin.log(t);
+ DroolsEclipsePlugin.log(t);
}
}
return list;
@@ -215,7 +215,7 @@
String text = javaTextWithParams.toString();
evalContext.codeComplete(text, text.length(), requestor);
} catch (Throwable t) {
- DroolsIDEPlugin.log(t);
+ DroolsEclipsePlugin.log(t);
}
}
return list;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/RuleCompletionProcessor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/RuleCompletionProcessor.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/RuleCompletionProcessor.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -16,7 +16,7 @@
import org.codehaus.jfdi.interpreter.ClassTypeResolver;
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsParserException;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.DroolsPluginImages;
import org.drools.eclipse.editors.AbstractRuleEditor;
import org.drools.eclipse.editors.DSLAdapter;
@@ -135,7 +135,7 @@
filterProposalsOnPrefix(prefix, list);
return list;
} catch (Throwable t) {
- DroolsIDEPlugin.log(t);
+ DroolsEclipsePlugin.log(t);
}
return null;
}
@@ -789,7 +789,7 @@
this.dslTree.buildTree(dslContents);
}
} catch (CoreException e) {
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
}
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/outline/RuleContentOutlinePage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/outline/RuleContentOutlinePage.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/outline/RuleContentOutlinePage.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -8,7 +8,7 @@
import org.drools.compiler.DroolsParserException;
import org.drools.eclipse.DRLInfo;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.core.DroolsElement;
import org.drools.eclipse.core.DroolsModelBuilder;
import org.drools.eclipse.core.Package;
@@ -224,7 +224,7 @@
public void initRules() {
rules = new HashMap();
try {
- DRLInfo drlInfo = DroolsIDEPlugin.getDefault().parseResource(editor, true, false);
+ DRLInfo drlInfo = DroolsEclipsePlugin.getDefault().parseResource(editor, true, false);
if (drlInfo != null) {
PackageDescr packageDescr = drlInfo.getPackageDescr();
for (Iterator iterator = packageDescr.getRules().iterator(); iterator.hasNext(); ) {
@@ -233,7 +233,7 @@
}
}
} catch (DroolsParserException e) {
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/rete/ReteViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/rete/ReteViewer.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/rete/ReteViewer.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -22,7 +22,7 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.eclipse.DRLInfo;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.editors.DRLRuleEditor;
import org.drools.eclipse.editors.rete.model.ReteGraph;
import org.drools.eclipse.editors.rete.part.VertexEditPartFactory;
@@ -108,7 +108,7 @@
private RuleBase getRuleBase(String contents) {
try {
- DRLInfo drlInfo = DroolsIDEPlugin.getDefault().parseResource(drlEditor, true, true);
+ DRLInfo drlInfo = DroolsEclipsePlugin.getDefault().parseResource(drlEditor, true, true);
if (drlInfo != null) {
Package pkg = drlInfo.getPackage();
ReteooRuleBase ruleBase = (ReteooRuleBase) RuleBaseFactory.newRuleBase(RuleBase.RETEOO);
@@ -116,7 +116,7 @@
return ruleBase;
}
} catch ( Throwable t ) {
- DroolsIDEPlugin.log( t );
+ DroolsEclipsePlugin.log( t );
}
return null;
}
@@ -174,7 +174,7 @@
} catch ( Throwable t ) {
if ( !(t instanceof InterruptedException) ) {
- DroolsIDEPlugin.log( t );
+ DroolsEclipsePlugin.log( t );
}
throw t;
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/rete/part/VertexEditPartFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/rete/part/VertexEditPartFactory.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/rete/part/VertexEditPartFactory.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -1,6 +1,6 @@
package org.drools.eclipse.editors.rete.part;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.editors.rete.model.Connection;
import org.drools.eclipse.editors.rete.model.ReteGraph;
import org.drools.reteoo.BaseVertex;
@@ -42,7 +42,7 @@
if ( modelElement instanceof Connection ) {
return new ConnectionEditPart();
}
- DroolsIDEPlugin.log( new Exception( "Can't create part for model element: " + ((modelElement != null) ? modelElement.getClass().getName() : "null") ) );
+ DroolsEclipsePlugin.log( new Exception( "Can't create part for model element: " + ((modelElement != null) ? modelElement.getClass().getName() : "null") ) );
return null;
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/GenericModelEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/GenericModelEditor.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/GenericModelEditor.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -24,7 +24,7 @@
import java.io.OutputStream;
import java.util.EventObject;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -268,7 +268,7 @@
InputStream is = file.getContents(false);
createInputStream(is);
} catch (Exception e) {
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
model = createModel();
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/DataTypeCombo.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/DataTypeCombo.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/DataTypeCombo.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.flow.common.datatype.IDataTypeRegistry;
import org.drools.ruleflow.common.datatype.IDataType;
import org.eclipse.jface.viewers.ComboViewer;
@@ -69,7 +69,7 @@
dataTypeCombo.setSelection(new StructuredSelection(registry.getDataTypeInfo(dataType.getClass())));
} catch (IllegalArgumentException e) {
// "DataTypeInfo not found in registry: " + dataType.getClass()
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
}
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/DataTypeEditorComposite.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/DataTypeEditorComposite.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/DataTypeEditorComposite.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -20,7 +20,7 @@
import java.util.Iterator;
import java.util.List;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.flow.common.datatype.IDataTypeRegistry;
import org.drools.eclipse.flow.common.view.datatype.editor.IDataTypeEditor;
import org.drools.ruleflow.common.datatype.IDataType;
@@ -60,19 +60,19 @@
new Class[] { Composite.class }).newInstance(new Object[] { this });
} catch (IllegalArgumentException e) {
// "Could not find data type info for type " + dataType.getClass()
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
} catch (InstantiationException e) {
// "Could not create editor for type " + editorClass
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
} catch (NoSuchMethodException e) {
// "Could not create editor for type " + editorClass
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
} catch (InvocationTargetException e) {
// "Could not create editor for type " + editorClass
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
} catch (IllegalAccessException e) {
// "Could not create editor for type " + editorClass
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
}
if (dataTypeEditor == null) {
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/EditorComposite.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/EditorComposite.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/EditorComposite.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -18,7 +18,7 @@
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.flow.common.datatype.IDataTypeRegistry;
import org.drools.eclipse.flow.common.view.datatype.editor.IEditor;
import org.drools.ruleflow.common.datatype.IDataType;
@@ -54,23 +54,23 @@
new Class[] { Composite.class }).newInstance(new Object[] { this });
} catch (IllegalArgumentException e) {
// "Could not find data type info for type " + type.getClass()
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
editor = new EmptyEditor(this);
} catch (InstantiationException e) {
// "Could not create editor for editor " + editorClass
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
editor = new EmptyEditor(this);
} catch (NoSuchMethodException e) {
// "Could not create editor for editor " + editorClass
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
editor = new EmptyEditor(this);
} catch (InvocationTargetException e) {
// "Could not create editor for editor " + editorClass
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
editor = new EmptyEditor(this);
} catch (IllegalAccessException e) {
// "Could not create editor for editor " + editorClass
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
editor = new EmptyEditor(this);
}
editor.setDataType(type);
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/RuleFlowModelEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/RuleFlowModelEditor.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/RuleFlowModelEditor.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -23,7 +23,7 @@
import java.io.OutputStream;
import java.io.OutputStreamWriter;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.flow.common.editor.GenericModelEditor;
import org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper;
import org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper;
@@ -90,7 +90,7 @@
}
writer.close();
} catch (Throwable t) {
- DroolsIDEPlugin.log(t);
+ DroolsEclipsePlugin.log(t);
}
}
@@ -133,7 +133,7 @@
true, false, monitor);
out.close();
} catch (Throwable t) {
- DroolsIDEPlugin.log(t);
+ DroolsEclipsePlugin.log(t);
}
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/RuleFlowPaletteFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/RuleFlowPaletteFactory.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/RuleFlowPaletteFactory.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -18,7 +18,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.flow.common.editor.core.ElementConnectionFactory;
import org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper;
import org.drools.eclipse.flow.ruleflow.core.ConnectionWrapperFactory;
@@ -72,8 +72,8 @@
"Create a new Start",
StartNodeWrapper.class,
new SimpleFactory(StartNodeWrapper.class),
- ImageDescriptor.createFromURL(DroolsIDEPlugin.getDefault().getBundle().getEntry("icons/process_start.gif")),
- ImageDescriptor.createFromURL(DroolsIDEPlugin.getDefault().getBundle().getEntry("icons/process_start.gif"))
+ ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/process_start.gif")),
+ ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/process_start.gif"))
);
entries.add(combined);
@@ -82,8 +82,8 @@
"Create a new End",
EndNodeWrapper.class,
new SimpleFactory(EndNodeWrapper.class),
- ImageDescriptor.createFromURL(DroolsIDEPlugin.getDefault().getBundle().getEntry("icons/process_stop.gif")),
- ImageDescriptor.createFromURL(DroolsIDEPlugin.getDefault().getBundle().getEntry("icons/process_stop.gif"))
+ ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/process_stop.gif")),
+ ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/process_stop.gif"))
);
entries.add(combined);
@@ -92,8 +92,8 @@
"Create a new RuleFlowGroup",
RuleSetNodeWrapper.class,
new SimpleFactory(RuleSetNodeWrapper.class),
- ImageDescriptor.createFromURL(DroolsIDEPlugin.getDefault().getBundle().getEntry("icons/activity.gif")),
- ImageDescriptor.createFromURL(DroolsIDEPlugin.getDefault().getBundle().getEntry("icons/activity.gif"))
+ ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/activity.gif")),
+ ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/activity.gif"))
);
entries.add(combined);
@@ -102,8 +102,8 @@
"Create a new Split",
SplitWrapper.class,
new SimpleFactory(SplitWrapper.class),
- ImageDescriptor.createFromURL(DroolsIDEPlugin.getDefault().getBundle().getEntry("icons/split.gif")),
- ImageDescriptor.createFromURL(DroolsIDEPlugin.getDefault().getBundle().getEntry("icons/split.gif"))
+ ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/split.gif")),
+ ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/split.gif"))
);
entries.add(combined);
@@ -112,8 +112,8 @@
"Create a new Join",
JoinWrapper.class,
new SimpleFactory(JoinWrapper.class),
- ImageDescriptor.createFromURL(DroolsIDEPlugin.getDefault().getBundle().getEntry("icons/join.gif")),
- ImageDescriptor.createFromURL(DroolsIDEPlugin.getDefault().getBundle().getEntry("icons/join.gif"))
+ ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/join.gif")),
+ ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/join.gif"))
);
entries.add(combined);
@@ -146,8 +146,8 @@
return ConnectionWrapper.class;
}
},
- ImageDescriptor.createFromURL(DroolsIDEPlugin.getDefault().getBundle().getEntry("icons/connection.gif")),
- ImageDescriptor.createFromURL(DroolsIDEPlugin.getDefault().getBundle().getEntry("icons/connection.gif"))
+ ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/connection.gif")),
+ ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/connection.gif"))
);
entries.add(tool);
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/action/CheckRuleFlowAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/action/CheckRuleFlowAction.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/action/CheckRuleFlowAction.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.flow.ruleflow.editor.RuleFlowModelEditor;
import org.drools.ruleflow.core.IRuleFlowProcessValidationError;
import org.drools.ruleflow.core.impl.RuleFlowProcessValidator;
@@ -63,7 +63,7 @@
"Check RuleFlow", "The RuleFlow model contains errors.",
new Status(
IStatus.ERROR,
- DroolsIDEPlugin.getDefault().getBundle().getSymbolicName(),
+ DroolsEclipsePlugin.getDefault().getBundle().getSymbolicName(),
IStatus.ERROR,
error.toString(),
null)
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/EndNodeEditPart.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/EndNodeEditPart.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/EndNodeEditPart.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.flow.common.editor.editpart.ElementEditPart;
import org.drools.eclipse.flow.common.editor.editpart.figure.ElementFigure;
import org.eclipse.draw2d.IFigure;
@@ -37,7 +37,7 @@
public static class EndNodeFigure extends ElementFigure {
private static Image icon = ImageDescriptor.createFromURL(
- DroolsIDEPlugin.getDefault().getBundle().getEntry("icons/process_stop.gif")).createImage();
+ DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/process_stop.gif")).createImage();
protected void customizeFigure() {
setIcon(icon);
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/StartNodeEditPart.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/StartNodeEditPart.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/StartNodeEditPart.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.flow.common.editor.editpart.ElementEditPart;
import org.drools.eclipse.flow.common.editor.editpart.figure.ElementFigure;
import org.eclipse.draw2d.IFigure;
@@ -37,7 +37,7 @@
public static class StartNodeFigure extends ElementFigure {
private static Image icon = ImageDescriptor.createFromURL(
- DroolsIDEPlugin.getDefault().getBundle().getEntry("icons/process_start.gif")).createImage();
+ DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/process_start.gif")).createImage();
protected void customizeFigure() {
setIcon(icon);
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableDialog.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableDialog.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.flow.common.datatype.DefaultDataTypeRegistry;
import org.drools.eclipse.flow.common.view.datatype.editor.IDataTypeEditor;
import org.drools.eclipse.flow.common.view.datatype.editor.impl.DataTypeCombo;
@@ -145,7 +145,7 @@
private void showError(String error) {
ErrorDialog.openError(getShell(), "Error", error, new Status(
- IStatus.ERROR, DroolsIDEPlugin.getDefault().getBundle().getSymbolicName(),
+ IStatus.ERROR, DroolsEclipsePlugin.getDefault().getBundle().getSymbolicName(),
IStatus.ERROR, error, null));
}
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/preferences/DroolsPreferencePage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/preferences/DroolsPreferencePage.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/preferences/DroolsPreferencePage.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -1,6 +1,6 @@
package org.drools.eclipse.preferences;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.swt.SWT;
@@ -39,7 +39,7 @@
}
protected IPreferenceStore doGetPreferenceStore() {
- return DroolsIDEPlugin.getDefault().getPreferenceStore();
+ return DroolsEclipsePlugin.getDefault().getPreferenceStore();
}
private void initializeDefaults() {
@@ -63,7 +63,7 @@
public boolean performOk() {
storeValues();
- DroolsIDEPlugin.getDefault().savePluginPreferences();
+ DroolsEclipsePlugin.getDefault().savePluginPreferences();
return true;
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/util/DroolsClasspathContainer.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/util/DroolsClasspathContainer.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/util/DroolsClasspathContainer.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -5,7 +5,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
@@ -95,7 +95,7 @@
return FileLocator.toFileURL(Platform.getBundle("org.drools.eclipse")
.getEntry("/")).getFile().toString();
} catch (IOException e) {
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
}
return null;
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/util/ProjectClassLoader.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/util/ProjectClassLoader.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/util/ProjectClassLoader.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -7,7 +7,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -87,9 +87,9 @@
}
}
} catch (JavaModelException e) {
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
} catch (MalformedURLException e) {
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
}
return pathElements;
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/view/rules/RulesView.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/view/rules/RulesView.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/view/rules/RulesView.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -7,7 +7,7 @@
import java.util.Map;
import org.drools.eclipse.DRLInfo;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.core.DroolsElement;
import org.drools.eclipse.core.DroolsModelBuilder;
import org.drools.eclipse.core.Function;
@@ -80,7 +80,7 @@
try {
ResourcesPlugin.getWorkspace().getRoot().accept(this);
} catch (CoreException e) {
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
}
ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
}
@@ -109,7 +109,7 @@
&& javaProject.isOnClasspath(resource)) {
try {
IFile file = (IFile) resource;
- DRLInfo drlInfo = DroolsIDEPlugin.getDefault().parseResource(resource, false);
+ DRLInfo drlInfo = DroolsEclipsePlugin.getDefault().parseResource(resource, false);
String packageName = drlInfo.getPackageName();
Package pkg = ruleSet.getPackage(packageName);
if (pkg == null) {
@@ -192,7 +192,7 @@
droolsElements.add(function);
}
} catch (Throwable t) {
- DroolsIDEPlugin.log(t);
+ DroolsEclipsePlugin.log(t);
}
return false;
}
@@ -246,7 +246,7 @@
}
}
} catch (Throwable t) {
- DroolsIDEPlugin.log(t);
+ DroolsEclipsePlugin.log(t);
}
}
@@ -278,7 +278,7 @@
droolsSelected.getOffset(), droolsSelected.getLength());
}
} catch (Throwable t) {
- DroolsIDEPlugin.log(t);
+ DroolsEclipsePlugin.log(t);
}
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/decisiontable/NewDTFilePage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/decisiontable/NewDTFilePage.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/decisiontable/NewDTFilePage.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -8,7 +8,7 @@
import java.io.InputStream;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IWorkbench;
@@ -53,7 +53,7 @@
if (page != null)
IDE.openEditor(page, newFile, true);
} catch (PartInitException e) {
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
return false;
}
return true;
@@ -61,7 +61,7 @@
protected InputStream getInitialContents() {
try {
- return DroolsIDEPlugin.getDefault().getBundle().getResource(
+ return DroolsEclipsePlugin.getDefault().getBundle().getResource(
"org/drools/ide/wizard/decisiontable/template.xls").openStream();
} catch (IOException e) {
return null;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/decisiontable/NewDTFileWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/decisiontable/NewDTFileWizard.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/decisiontable/NewDTFileWizard.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -1,6 +1,6 @@
package org.drools.eclipse.wizard.decisiontable;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
@@ -22,7 +22,7 @@
this.workbench = workbench;
this.selection = selection;
setWindowTitle("New Decision Table");
- ImageDescriptor desc = DroolsIDEPlugin.getImageDescriptor("icons/dt-large.gif");
+ ImageDescriptor desc = DroolsEclipsePlugin.getImageDescriptor("icons/dt-large.gif");
setDefaultPageImageDescriptor(desc);
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/dsl/NewDSLFilePage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/dsl/NewDSLFilePage.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/dsl/NewDSLFilePage.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -8,7 +8,7 @@
import java.io.InputStream;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IWorkbench;
@@ -54,7 +54,7 @@
if (page != null)
IDE.openEditor(page, newFile, true);
} catch (PartInitException e) {
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
return false;
}
return true;
@@ -62,7 +62,7 @@
protected InputStream getInitialContents() {
try {
- return DroolsIDEPlugin.getDefault().getBundle().getResource(
+ return DroolsEclipsePlugin.getDefault().getBundle().getResource(
"org/drools/ide/wizard/dsl/template.dsl").openStream();
} catch (IOException e) {
return null;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/dsl/NewDSLFileWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/dsl/NewDSLFileWizard.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/dsl/NewDSLFileWizard.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -1,6 +1,6 @@
package org.drools.eclipse.wizard.dsl;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
@@ -23,7 +23,7 @@
this.workbench = workbench;
this.selection = selection;
setWindowTitle("New Domain Specific Language configuration");
- ImageDescriptor desc = DroolsIDEPlugin.getImageDescriptor("icons/dsl-large.png");
+ ImageDescriptor desc = DroolsEclipsePlugin.getImageDescriptor("icons/dsl-large.png");
setDefaultPageImageDescriptor(desc);
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/project/NewDroolsProjectWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/project/NewDroolsProjectWizard.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/project/NewDroolsProjectWizard.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -7,7 +7,7 @@
import java.util.Arrays;
import java.util.List;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.builder.DroolsBuilder;
import org.drools.eclipse.util.DroolsClasspathContainer;
import org.eclipse.core.resources.ICommand;
@@ -95,7 +95,7 @@
try {
getContainer().run(true, true, op);
} catch (Throwable t) {
- DroolsIDEPlugin.log(t);
+ DroolsEclipsePlugin.log(t);
}
}
@@ -143,7 +143,7 @@
((CoreException) t).getStatus());
}
} else {
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
}
return null;
}
@@ -341,7 +341,7 @@
}
protected void initializeDefaultPageImageDescriptor() {
- ImageDescriptor desc = DroolsIDEPlugin.getImageDescriptor("icons/drools-large.PNG");
+ ImageDescriptor desc = DroolsEclipsePlugin.getImageDescriptor("icons/drools-large.PNG");
setDefaultPageImageDescriptor(desc);
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/rule/NewRulePackagePage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/rule/NewRulePackagePage.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/rule/NewRulePackagePage.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -7,7 +7,7 @@
import java.io.IOException;
import java.io.InputStream;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
@@ -143,7 +143,7 @@
if (page != null)
IDE.openEditor(page, newFile, true);
} catch (PartInitException e) {
- DroolsIDEPlugin.log(e);
+ DroolsEclipsePlugin.log(e);
return false;
}
return true;
@@ -182,7 +182,7 @@
}
private InputStream getTemplate(String templatePath) throws IOException {
- return DroolsIDEPlugin.getDefault().getBundle().getResource(templatePath).openStream();
+ return DroolsEclipsePlugin.getDefault().getBundle().getResource(templatePath).openStream();
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/rule/NewRulePackageWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/rule/NewRulePackageWizard.java 2007-04-01 20:54:20 UTC (rev 10687)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/wizard/rule/NewRulePackageWizard.java 2007-04-02 01:58:09 UTC (rev 10688)
@@ -1,6 +1,6 @@
package org.drools.eclipse.wizard.rule;
-import org.drools.eclipse.DroolsIDEPlugin;
+import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
@@ -24,7 +24,7 @@
this.selection = selection;
setWindowTitle("New Rule Package...");
- ImageDescriptor desc = DroolsIDEPlugin.getImageDescriptor("icons/drools-large.PNG");
+ ImageDescriptor desc = DroolsEclipsePlugin.getImageDescriptor("icons/drools-large.PNG");
setDefaultPageImageDescriptor(desc);
}
More information about the jboss-svn-commits
mailing list