From 93b5df4f2a2bd6e412133b9d96b89af7484871a3 Mon Sep 17 00:00:00 2001 From: Simon Barner Date: Fri, 19 Nov 2021 08:55:37 +0100 Subject: [PATCH 1/4] Remove menu entry for deprecated library implementation Issue-Ref: 3946 Issue-Url: https://git.fortiss.org/af3/af3/-/issues/3946 Signed-off-by: Simon Barner --- org.fortiss.af3.rcp.application/plugin.xml | 6 ------ .../org/fortiss/af3/rcp/application/.ratings | 2 +- .../application/NewProjectContextMenu.java | 11 ++++------ .../af3/rcp/application/advisors/.ratings | 2 +- .../advisors/ApplicationActionBarAdvisor.java | 21 ------------------- 5 files changed, 6 insertions(+), 36 deletions(-) diff --git a/org.fortiss.af3.rcp.application/plugin.xml b/org.fortiss.af3.rcp.application/plugin.xml index 87c2aaf..7747f46 100644 --- a/org.fortiss.af3.rcp.application/plugin.xml +++ b/org.fortiss.af3.rcp.application/plugin.xml @@ -190,12 +190,6 @@ id="org.fortiss.af3.rcp.application.loadOperatorPanelExample" name="LoadOperatorPanelExample"> - - contributionItems = new ArrayList(); - contributionItems.add(new ActionContributionItem(getNewAF3ProjectAction())); - contributionItems.add(new ActionContributionItem(getNewAF3LibraryAction())); - return contributionItems; + singletonList((new ActionContributionItem(getNewAF3ProjectAction()))); } return null; } diff --git a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/.ratings b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/.ratings index 175e142..f567ab1 100644 --- a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/.ratings +++ b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/.ratings @@ -1,3 +1,3 @@ -ApplicationActionBarAdvisor.java 881198ff05ab14110efef1673f0914725348442b GREEN +ApplicationActionBarAdvisor.java 7346ff02f98249d473d19a653a1d2a3fdc0cf334 YELLOW ApplicationWorkbenchAdvisor.java 19af4bc3262680a283eccccf92c4e2ae4463fa71 GREEN ApplicationWorkbenchWindowAdvisor.java da5cb38300b384579532c678fbc9faa961c2ca6b GREEN diff --git a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/ApplicationActionBarAdvisor.java b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/ApplicationActionBarAdvisor.java index 881198f..7346ff0 100644 --- a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/ApplicationActionBarAdvisor.java +++ b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/ApplicationActionBarAdvisor.java @@ -104,9 +104,6 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor { /** AF3-Specific Action to crate a new empty project. */ private static WorkbenchCommandAction newAF3ProjectAction; - /** AF3-Specific Action to crate a new empty library. */ - private static WorkbenchCommandAction newAF3LibraryAction; - /** Open the "goBack" view. */ private static IWorkbenchAction goBack; @@ -210,7 +207,6 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor { register(deleteAction); registerCreateNewProject(window); - registerCreateNewLibrary(window); registerLoadSimpleTrafficLightsExample(window); registerLoadSimpleTrafficLightsModesExample(window); registerLoadSimpleTrafficLightsCodeGenerationExample(window); @@ -336,16 +332,6 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor { null, window); } - /** - * Registers the "New AF3 Library" action and attaches it to the corresponding button. - */ - private void registerCreateNewLibrary(IWorkbenchWindow window) { - newAF3LibraryAction = createAndRegisterWorkBenchCommandAction("New AF3 Library", - "org.fortiss.af3.rcp.application.newaf3library", getPluginImageDescriptor( - "org.fortiss.af3.rcp.application", "icons/new_library.png"), - null, window); - } - /** * Registers the "Load Simple Traffic Lights Example" action and attaches it to the * corresponding button. @@ -530,7 +516,6 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor { ToolBarManager toolBarManager = new ToolBarManager(); coolBar.add(toolBarManager); toolBarManager.add(newAF3ProjectAction); - toolBarManager.add(newAF3LibraryAction); toolBarManager.add(new Separator()); toolBarManager.add(saveAction); toolBarManager.add(new Separator()); @@ -547,7 +532,6 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor { IWorkbenchActionConstants.M_FILE); menuBar.add(fileMenu); fileMenu.add(newAF3ProjectAction); - fileMenu.add(newAF3LibraryAction); MenuManager openAF3ExampleMenuManager = new MenuManager("Open AF3 Example"); fileMenu.add(openAF3ExampleMenuManager); @@ -602,11 +586,6 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor { helpMenu.add(showModelStorageErrorDialogAction); } - /** Returns defined action to create new AF3 Library. */ - public static WorkbenchCommandAction getNewAF3LibraryAction() { - return newAF3LibraryAction; - } - /** Returns defined action to create new AF3 Project. */ public static WorkbenchCommandAction getNewAF3ProjectAction() { return newAF3ProjectAction; -- GitLab From 73d1903f452d41276db867279ba2bd09ef8a754e Mon Sep 17 00:00:00 2001 From: Simon Barner Date: Mon, 21 Feb 2022 19:57:27 +0100 Subject: [PATCH 2/4] Remove library view Issue-Ref: 4161 Issue-Url: https://git.fortiss.org/af3/af3/-/issues/4161 Signed-off-by: Simon Barner --- .../af3/rcp/application/handler/.ratings | 2 +- .../handler/ApplicationCommandHandler.java | 46 ------------------- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/handler/.ratings b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/handler/.ratings index 51df362..dae6b01 100644 --- a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/handler/.ratings +++ b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/handler/.ratings @@ -1 +1 @@ -ApplicationCommandHandler.java 3225d9f72590fcea939b14cae05467cbace1f438 GREEN +ApplicationCommandHandler.java b875be2e477ee14f4b60f6dddbafc984968c9ce3 YELLOW diff --git a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/handler/ApplicationCommandHandler.java b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/handler/ApplicationCommandHandler.java index 3225d9f..b875be2 100644 --- a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/handler/ApplicationCommandHandler.java +++ b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/handler/ApplicationCommandHandler.java @@ -17,11 +17,9 @@ package org.fortiss.af3.rcp.application.handler; import static org.conqat.ide.commons.ui.logging.LoggingUtils.logAndShowError; -import static org.conqat.ide.commons.ui.ui.WorkbenchUtils.getActiveWorkbenchWindow; import static org.eclipse.emf.common.util.URI.createFileURI; import static org.eclipse.emf.common.util.URI.createPlatformPluginURI; import static org.eclipse.jface.dialogs.ErrorDialog.openError; -import static org.eclipse.jface.dialogs.MessageDialog.openError; import static org.eclipse.ui.PlatformUI.getWorkbench; import static org.eclipse.ui.internal.about.AboutUtils.openErrorLogBrowser; import static org.fortiss.af3.project.AF3Project.AF3_PRJ_SUFFIX; @@ -30,7 +28,6 @@ import static org.fortiss.af3.project.ui.utils.ExportProjectUtils.fileSelectionD import static org.fortiss.af3.project.ui.utils.ExportProjectUtils.getSelectedFileProject; import static org.fortiss.af3.project.ui.utils.ImportProjectUtils.fileSelectionDialog; import static org.fortiss.af3.project.ui.utils.ImportProjectUtils.importUISelectedFile; -import static org.fortiss.af3.project.utils.LibraryModelElementFactory.createFileLibrary; import static org.fortiss.af3.rcp.application.utils.ApplicationUtils.switchToAF3Perspective; import static org.fortiss.tooling.kernel.utils.EMFResourceUtils.refreshWorkspace; import static org.fortiss.tooling.kernel.utils.EcoreUtils.copy; @@ -38,30 +35,23 @@ import static org.fortiss.tooling.kernel.utils.EcoreUtils.copy; import java.io.File; import java.util.List; -import org.conqat.ide.commons.ui.ui.WorkbenchUtils; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.MultiStatus; import org.eclipse.core.runtime.Status; import org.eclipse.emf.common.util.URI; -import org.eclipse.jface.dialogs.InputDialog; -import org.eclipse.jface.window.Window; import org.eclipse.swt.widgets.Display; import org.fortiss.af3.expression.examples.ConfiguredExpressionExample; import org.fortiss.af3.mode.AF3ModeActivator; import org.fortiss.af3.mode.ui.examples.SimpleTrafficLightsModesExample; import org.fortiss.af3.project.example.IExample; -import org.fortiss.af3.project.model.FileLibrary; import org.fortiss.af3.project.model.FileProject; -import org.fortiss.af3.project.ui.utils.FileNameValidatorUtil; -import org.fortiss.af3.project.utils.ProjectUtils; import org.fortiss.af3.rcp.application.AF3ApplicationActivator; import org.fortiss.af3.rcp.application.example.SimpleTrafficLightsCodeGenerationExample; import org.fortiss.af3.rcp.application.utils.ApplicationUtils; import org.fortiss.tooling.kernel.extension.data.ModelStorageError; import org.fortiss.tooling.kernel.service.IPersistencyService; -import org.fortiss.tooling.kernel.ui.internal.views.library.LibraryViewPart; /** * The ApplicationCommandHandler has several nested classes, each for handling a @@ -131,42 +121,6 @@ public class ApplicationCommandHandler { } } - /** Handles the command action to create a new AF3 library. */ - public static final class NewAF3LibraryCommandHandler extends AbstractHandler { - - /** - * Execute definition that creates a new AF3 library and, if required, a - * new general library directory. - */ - @Override - public Object execute(ExecutionEvent event) { - // Create a new AF3 library. - try { - InputDialog dlg = new InputDialog(Display.getCurrent().getActiveShell(), "", - "Please enter a library name", "AF3-Library", new FileNameValidatorUtil()); - - if(dlg.open() != Window.OK) { - return null; - } - - FileLibrary library = createFileLibrary(dlg.getValue()); - - // If a file with this name already exists. - if(!ProjectUtils.saveFileLibrary(library)) { - openError(getActiveWorkbenchWindow().getShell(), - "Error While Saving the Library", - "A library with name " + dlg.getValue() + " already exists"); - } - WorkbenchUtils.getActiveWorkbenchPage().showView(LibraryViewPart.ID); - } catch(Exception e) { - openError(getActiveWorkbenchWindow().getShell(), "Error", e.getMessage()); - return false; - } - - return null; - } - } - /** Handles the command action to create the standard SimpleTrafficLightsExample project. */ public static final class LoadSimpleTrafficLightsExampleCommandHandler extends AbstractHandler { -- GitLab From 1b19789cec8910f0ef66f6316e0e5a76864f7dbc Mon Sep 17 00:00:00 2001 From: Sebastian Bergemann Date: Fri, 25 Feb 2022 16:22:16 +0100 Subject: [PATCH 3/4] GREEN (small fix + unused image removed) Issue-Ref: 3946 Issue-Url: https://git.fortiss.org/af3/af3/-/issues/3946 Signed-off-by: Sebastian Bergemann --- .../icons/new_library.png | Bin 3464 -> 0 bytes .../src/org/fortiss/af3/rcp/application/.ratings | 2 +- .../rcp/application/NewProjectContextMenu.java | 2 +- .../af3/rcp/application/advisors/.ratings | 2 +- .../fortiss/af3/rcp/application/handler/.ratings | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 org.fortiss.af3.rcp.application/icons/new_library.png diff --git a/org.fortiss.af3.rcp.application/icons/new_library.png b/org.fortiss.af3.rcp.application/icons/new_library.png deleted file mode 100644 index 22ae13466d6922452caf6eb9d5ca3db58aa8e2ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3464 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 Date: Fri, 4 Mar 2022 10:24:21 +0100 Subject: [PATCH 4/4] Remove rejected ticket from new features list Issue-Ref: 3946 Issue-Url: https://af3-developer.fortiss.org/issues/3946 Signed-off-by: Simon Barner --- org.fortiss.af3.rcp.application/intro/newFeatures.html | 1 - .../intro/newFeatures_af3_fortissPage.html | 1 - 2 files changed, 2 deletions(-) diff --git a/org.fortiss.af3.rcp.application/intro/newFeatures.html b/org.fortiss.af3.rcp.application/intro/newFeatures.html index f6486eb..566fbd0 100644 --- a/org.fortiss.af3.rcp.application/intro/newFeatures.html +++ b/org.fortiss.af3.rcp.application/intro/newFeatures.html @@ -60,7 +60,6 @@
  • MIRA: Status cells are also editable where they should not (#4133)
  • [DSE] Enable import of partition architectures (#4127)
  • Implement a JFX controller for the creation and visualization of reference lists (#4092)
    • -
  • LibraryView to JavaFX (#4019)
  • Introduce Zoom control (#3843)
  • Fix: icons in requirement editor do not vanish correctly when collapsing row items (#4166)
  • [Allocation] Exclude parameter tables when traversing allocation tables (#4158)
    • diff --git a/org.fortiss.af3.rcp.application/intro/newFeatures_af3_fortissPage.html b/org.fortiss.af3.rcp.application/intro/newFeatures_af3_fortissPage.html index a4405b2..511909b 100644 --- a/org.fortiss.af3.rcp.application/intro/newFeatures_af3_fortissPage.html +++ b/org.fortiss.af3.rcp.application/intro/newFeatures_af3_fortissPage.html @@ -106,7 +106,6 @@
  • MIRA: Status cells are also editable where they should not (#4133)
  • [DSE] Enable import of partition architectures (#4127)
  • Implement a JFX controller for the creation and visualization of reference lists (#4092) -
  • LibraryView to JavaFX (#4019)
  • Introduce Zoom control (#3843)
  • Fix: icons in requirement editor do not vanish correctly when collapsing row items (#4147)
  • [Allocation] Exclude parameter tables when traversing allocation tables (#4158) -- GitLab