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 Binary files a/org.fortiss.af3.rcp.application/icons/new_library.png and /dev/null differ diff --git a/org.fortiss.af3.rcp.application/intro/newFeatures.html b/org.fortiss.af3.rcp.application/intro/newFeatures.html index f6486eb02da6134c7f0a2e41e96fa6282bdb8a54..566fbd0af60e85f071c940a62bdd81172dffdc8c 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 a4405b298cc09360e1e7e4ffebf87799fd6ba103..511909b38e863e70827e936bcb4ea06b070784e2 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) diff --git a/org.fortiss.af3.rcp.application/plugin.xml b/org.fortiss.af3.rcp.application/plugin.xml index 87c2aaf0969acadd293930258cd3ad4fb5bcc67e..7747f464afef5b2f7b79f9b24b027d3bb9d2d5d7 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; + return 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 175e142321cd802cb6c105ee7986373c9e8d1e14..5a679f96420e3f904f2c95fe20a5dfd9630162dc 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 GREEN 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 881198ff05ab14110efef1673f0914725348442b..7346ff02f98249d473d19a653a1d2a3fdc0cf334 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; 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 51df362b4ca11deb67d7cb3bf1b447689a09c823..50243c556e76d671cb331adc1d9072e35735c4c0 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 GREEN 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 3225d9f72590fcea939b14cae05467cbace1f438..b875be2e477ee14f4b60f6dddbafc984968c9ce3 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 {