From d72714ea61d8dfcc28bc71d40b778486b55e5b6a Mon Sep 17 00:00:00 2001 From: Andreas Date: Mon, 16 Oct 2023 19:57:50 +0200 Subject: [PATCH] remove broken m2e integration #737 --- umlet-eclipse-plugin/META-INF/MANIFEST.MF | 31 ++++++++----- umlet-eclipse-plugin/plugin.xml | 7 --- .../plugin/MavenProjectChangedListener.java | 45 ------------------- 3 files changed, 19 insertions(+), 64 deletions(-) delete mode 100644 umlet-eclipse-plugin/src/main/java/com/baselet/plugin/MavenProjectChangedListener.java diff --git a/umlet-eclipse-plugin/META-INF/MANIFEST.MF b/umlet-eclipse-plugin/META-INF/MANIFEST.MF index df5021971..e5b6031eb 100644 --- a/umlet-eclipse-plugin/META-INF/MANIFEST.MF +++ b/umlet-eclipse-plugin/META-INF/MANIFEST.MF @@ -5,9 +5,9 @@ Bundle-ManifestVersion: 2 Bundle-Name: UMLet Bundle-SymbolicName: com.umlet.plugin;singleton:=true Bundle-Version: 15.2.0.qualifier -Bundle-ClassPath: .,lib/bcel.jar,lib/itextpdf.jar,lib/batik-xml.jar,li - b/rhino.jar,lib/javaparser-core.jar,lib/commons-io.jar,lib/batik-awt- - util.jar,lib/javax.mail.jar,lib/batik-svggen.jar,lib/batik-dom.jar,li +Bundle-ClassPath: .,lib/bcel.jar,lib/batik-xml.jar,lib/rhino.jar,lib/j + avaparser-core.jar,lib/commons-io.jar,lib/batik-awt-util.jar,lib/itex + tpdf.jar,lib/javax.mail.jar,lib/batik-svggen.jar,lib/batik-dom.jar,li b/batik-util.jar,lib/batik-ext.jar,lib/rsyntaxtextarea.jar,lib/reload 4j.jar,lib/autocomplete.jar,lib/slf4j-reload4j.jar,lib/umlet-swing.ja r,lib/jlibeps.jar,lib/ecj.jar,lib/slf4j-api.jar,lib/umlet-elements.ja @@ -15,15 +15,22 @@ Bundle-ClassPath: .,lib/bcel.jar,lib/itextpdf.jar,lib/batik-xml.jar,li Bundle-Activator: com.baselet.plugin.MainPlugin Export-Package: com.baselet.plugin,com.baselet.plugin.gui,com.baselet. plugin.wizard -Require-Bundle: org.eclipse.ui,org.eclipse.ui.ide,org.eclipse.core.res - ources,org.eclipse.core.runtime,org.eclipse.core.commands,org.eclipse - .core.expressions,org.eclipse.jface,org.eclipse.jface.text;resolution - :=optional,org.eclipse.jdt.core;resolution:=optional,org.eclipse.jdt. - ui;resolution:=optional,org.eclipse.ui.workbench.texteditor,org.eclip - se.ltk.core.refactoring;resolution:=optional,org.eclipse.jdt.core.man - ipulation;resolution:=optional,org.eclipse.m2e.core;resolution:=optio - nal,org.eclipse.m2e.maven.runtime;resolution:=optional,org.eclipse.e4 - .core.contexts,org.eclipse.e4.ui.bindings,org.eclipse.e4.ui.workbench +Require-Bundle: org.eclipse.ui, + org.eclipse.ui.ide, + org.eclipse.core.resources, + org.eclipse.core.runtime, + org.eclipse.core.commands, + org.eclipse.core.expressions, + org.eclipse.jface, + org.eclipse.jface.text;resolution:=optional, + org.eclipse.jdt.core;resolution:=optional, + org.eclipse.jdt.ui;resolution:=optional, + org.eclipse.ui.workbench.texteditor, + org.eclipse.ltk.core.refactoring;resolution:=optional, + org.eclipse.jdt.core.manipulation;resolution:=optional, + org.eclipse.e4.core.contexts, + org.eclipse.e4.ui.bindings, + org.eclipse.e4.ui.workbench Bundle-ActivationPolicy: lazy Eclipse-LazyStart: true Import-Package: org.eclipse.core.filesystem diff --git a/umlet-eclipse-plugin/plugin.xml b/umlet-eclipse-plugin/plugin.xml index 525c6f7b4..ddc060916 100644 --- a/umlet-eclipse-plugin/plugin.xml +++ b/umlet-eclipse-plugin/plugin.xml @@ -193,11 +193,4 @@ - - - - - diff --git a/umlet-eclipse-plugin/src/main/java/com/baselet/plugin/MavenProjectChangedListener.java b/umlet-eclipse-plugin/src/main/java/com/baselet/plugin/MavenProjectChangedListener.java deleted file mode 100644 index 599ed9788..000000000 --- a/umlet-eclipse-plugin/src/main/java/com/baselet/plugin/MavenProjectChangedListener.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.baselet.plugin; - -import org.apache.maven.project.MavenProject; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.m2e.core.project.IMavenProjectChangedListener; -import org.eclipse.m2e.core.project.MavenProjectChangedEvent; - -import com.baselet.plugin.builder.AddRemoveUmletNatureHandler; - -/** - * Listener to add and remove the umlet nature when the maven project changes - */ -public class MavenProjectChangedListener implements IMavenProjectChangedListener { - - private static String configPropertyValue(MavenProject project) { - if (project == null) { - return null; - } - - String propertyValue = project.getProperties().getProperty("com.umlet.nature.enabled"); - return propertyValue; - } - - @Override - public void mavenProjectChanged(MavenProjectChangedEvent[] events, IProgressMonitor pm) { - for (MavenProjectChangedEvent event : events) { - try { - IProject project = event.getMavenProject().getProject(); - - String propertyValue = configPropertyValue(event.getMavenProject().getMavenProject()); - if ("true".equalsIgnoreCase(propertyValue)) { - AddRemoveUmletNatureHandler.addUmletNature(project); - } - else if ("false".equalsIgnoreCase(propertyValue)) { - AddRemoveUmletNatureHandler.removeUmletNature(project); - } - } catch (CoreException e) { - MainPlugin.logError("Error while updating maven project", e); - } - } - } - -}