Skip to content
Snippets Groups Projects
Commit 40a1925b authored by Sebastian Bergemann's avatar Sebastian Bergemann
Browse files

YELLOW (3 of 3 fixes)

Issue-ref: 4149
Issue-URL: af3#4149



Signed-off-by: default avatarSebastian Bergemann <bergemann@fortiss.org>
parent 0065869d
No related branches found
No related tags found
1 merge request!181Added correct hash creation in reuse (+ update detection)
Pipeline #36089 failed
Showing
with 662 additions and 69 deletions
AddElementContextMenu.java 1b5436d37bd93fe9106a3f21cf3d5a2b3656490e GREEN
GetUpdatedOriginsContextMenu.java 672ee49ed98a2b2f046c06e42f541e650b67772f GREEN
UpdateFromLibContextMenu.java f37c4165011ffd5d4bbf07c70effd187dc8d4cfd YELLOW
UpdateInLibContextMenu.java 3e3055b24ee32f467a7c3a11a075eabb28832c1c YELLOW
AddElementContextMenu.java ab4536e73323802e46d50d0bb9f62d6becc9db39 GREEN
GetUpdatedOriginsContextMenu.java cfb16bb084be5a76a7ec70c2882242543535bc87 GREEN
UpdateFromLibContextMenu.java 58f56f4c2da66655a5c1bf93c370bd4f2dba5dd4 YELLOW
UpdateInLibContextMenu.java cb5aeb92f8e511339bec675a3764284d977dd45d YELLOW
......@@ -23,12 +23,12 @@ import static org.eclipse.ui.PlatformUI.getWorkbench;
import static org.fortiss.tooling.ext.reuse.ui.prototypes.PrototypeProvider.DEFAULT_ROOT_REUSE_ELEMENT_NAME;
import static org.fortiss.tooling.ext.reuse.ui.utils.ReuseLibraryUIUtils.manageExternalReferencesOfReuseElement;
import static org.fortiss.tooling.ext.reuse.ui.utils.ReuseLibraryViewUtils.raiseAndUpdateReuseLibraryView;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.addElementToLibrary;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.createAndAddReuseLibrary;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.createElementForLibrary;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getAllLocalReuseLibraries;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getReuseElementName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.hasReusePossibility;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getAllLocalReuseLibraries;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getReuseElementName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.hasReusePossibility;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsManipulation.addElementToLibrary;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsManipulation.createAndAddReuseLibrary;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsManipulation.createElementForLibrary;
import static org.fortiss.tooling.kernel.ui.service.IContextMenuService.TOP_MOST_MENU_SECTION_ID;
import java.util.ArrayList;
......
......@@ -18,11 +18,12 @@ package org.fortiss.tooling.ext.reuse.ui.commands;
import static java.util.Collections.emptyList;
import static org.conqat.ide.commons.ui.dialog.MessageUtils.showInfo;
import static org.fortiss.tooling.ext.reuse.ui.commands.UpdateFromLibContextMenu.UPDATE_FROM_CONTEXT_MENU_STRING;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getFirstSourceLibraryOfElement;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getLibraryIDName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getReuseElementLastUpdateString;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getReuseElementName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.isCorrectReuseElement;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getAllUpdatedOrigins;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getFirstSourceLibraryOfElement;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getLibraryIDName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getReuseElementLastUpdateString;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getReuseElementName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.isCorrectReuseElement;
import static org.fortiss.tooling.kernel.ui.service.IContextMenuService.TOP_MOST_MENU_SECTION_ID;
import java.util.ArrayList;
......@@ -34,7 +35,6 @@ import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.IContributionItem;
import org.fortiss.tooling.ext.reuse.model.ReuseLibrary;
import org.fortiss.tooling.ext.reuse.ui.ToolingReuseUIActivator;
import org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils;
import org.fortiss.tooling.kernel.service.ICommandStackService;
import org.fortiss.tooling.kernel.ui.extension.IContextMenuContributor;
import org.fortiss.tooling.kernel.ui.extension.data.ContextMenuContextProvider;
......@@ -88,7 +88,7 @@ public class GetUpdatedOriginsContextMenu implements IContextMenuContributor {
return;
}
List<EObject> updatedReuseOrigins = ReuseLibraryUtils.getAllUpdatedOrigins(reuseElement);
List<EObject> updatedReuseOrigins = getAllUpdatedOrigins(reuseElement);
// Currently, it is just a brief text message about this information.
// It could also be possible to provide directly update options within this
......@@ -110,8 +110,8 @@ public class GetUpdatedOriginsContextMenu implements IContextMenuContributor {
infoMessage += "Within library: '" + libraryName + "'\n";
infoMessage += "Last updated: " + lastUpdate + "\n";
}
infoMessage += "\nIf you want to get one of these updates, please use the '" + UPDATE_FROM_CONTEXT_MENU_STRING
+ "' context menu entry.";
infoMessage += "\nIf you want to get one of these updates, please use the '"
+ UPDATE_FROM_CONTEXT_MENU_STRING + "' context menu entry.";
}
showInfo(shellTitle, infoMessage);
}
......
......@@ -25,13 +25,13 @@ import static org.fortiss.tooling.ext.reuse.ui.utils.ReuseLibraryUIUtils.isKeepi
import static org.fortiss.tooling.ext.reuse.ui.utils.ReuseLibraryUIUtils.manageExternalReferencesOfReuseElement;
import static org.fortiss.tooling.ext.reuse.ui.utils.ReuseLibraryUIUtils.selectCorrectReuseSpec;
import static org.fortiss.tooling.ext.reuse.ui.utils.ReuseLibraryUIUtils.warnOfMissingLib;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.fixIds;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getLibraryIDName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getLocalReuseLibraryByID;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getNumberOfContainedReuseSpecs;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getReuseElementName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.isCorrectReuseElement;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.replaceElementInProject;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getLibraryIDName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getLocalReuseLibraryByID;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getNumberOfContainedReuseSpecs;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getReuseElementName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.isCorrectReuseElement;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsManipulation.fixIDs;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsManipulation.replaceElementInProject;
import static org.fortiss.tooling.kernel.ui.service.IContextMenuService.TOP_MOST_MENU_SECTION_ID;
import static org.fortiss.tooling.kernel.utils.EcoreUtils.getParentsWithType;
......@@ -121,7 +121,7 @@ public class UpdateFromLibContextMenu implements IContextMenuContributor {
return;
}
fixIds(updatedElement);
fixIDs(updatedElement);
String currentActionType = "updateFromLibrary";
manageExternalReferencesOfReuseElement(originalLibraryElement, currentActionType, SHELL_TITLE);
......
......@@ -27,11 +27,11 @@ import static org.fortiss.tooling.ext.reuse.ui.utils.ReuseLibraryUIUtils.manageE
import static org.fortiss.tooling.ext.reuse.ui.utils.ReuseLibraryUIUtils.selectCorrectReuseSpec;
import static org.fortiss.tooling.ext.reuse.ui.utils.ReuseLibraryUIUtils.warnOfMissingLib;
import static org.fortiss.tooling.ext.reuse.ui.utils.ReuseLibraryViewUtils.raiseAndUpdateReuseLibraryView;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getLibraryIDName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getLocalReuseLibraryByID;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getReuseElementName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.isCorrectReuseElement;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.replaceElementInLibrary;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getLibraryIDName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getLocalReuseLibraryByID;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getReuseElementName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.isCorrectReuseElement;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsManipulation.replaceElementInLibrary;
import static org.fortiss.tooling.kernel.ui.service.IContextMenuService.TOP_MOST_MENU_SECTION_ID;
import static org.fortiss.tooling.kernel.utils.EcoreUtils.getParentsWithType;
......
AddElementToLibDialog.java a67b6f17964c28c20c05051d2d64837f617aa7f1 GREEN
AddElementToLibDialog.java 357ddbf24d5e1776ae248c611ab6b40861cc548b GREEN
SelectLibDialog.java dce5cabd034a8a517d782fae05bda7b183b11bc6 GREEN
......@@ -24,7 +24,7 @@ import static org.eclipse.swt.SWT.LEFT;
import static org.eclipse.swt.SWT.NONE;
import static org.eclipse.swt.SWT.READ_ONLY;
import static org.eclipse.swt.SWT.TITLE;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getLibraryIDName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getLibraryIDName;
import java.util.ArrayList;
import java.util.List;
......
PrototypeProvider.java 98466335d6927db689639642159db43acd244ad9 GREEN
PrototypeProvider.java 76ee1b194635f76b1ca09f93ac37f8155b53ddb5 GREEN
......@@ -15,8 +15,8 @@
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.ext.reuse.ui.prototypes;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getAllLocalReuseLibraries;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getReuseElementName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getAllLocalReuseLibraries;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getReuseElementName;
import java.util.List;
......
ReuseLibraryUIUtils.java d3e63e1d2d6a275ea7697bceee9f57bcfc2d1d08 GREEN
ReuseLibraryUIUtils.java 0f8d233c725d9dbd39ff6613a69c997786264054 GREEN
ReuseLibraryViewUtils.java 34a852dc692ec56cb3e9fd8dcea99d64f31503b3 GREEN
......@@ -21,11 +21,11 @@ import static org.conqat.ide.commons.ui.dialog.MessageUtils.showInfo;
import static org.conqat.ide.commons.ui.dialog.MessageUtils.showWarning;
import static org.conqat.ide.commons.ui.ui.WorkbenchUtils.getActiveWorkbenchWindow;
import static org.fortiss.tooling.ext.reuse.storage.ReuseLibraryStorageManager.REUSE_PROJECT_DIR;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getAllReuseSpecs;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getElementInsideLibrary;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getExternalReferencesOfElement;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getLibraryIDNameFormat;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getReuseElementName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getAllReuseSpecs;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getElementInsideLibrary;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getExternalReferencesOfElement;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getLibraryIDNameFormat;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getReuseElementName;
import java.util.ArrayList;
import java.util.List;
......
IReuseLibraryViewPart.java 5a1764ffae9cf35b94bd8b640f82daa95c44c8ac GREEN
ReuseLibraryFXContentProvider.java 5a0d83b818bcb77549ca3358028f5b38f4365f4e GREEN
ReuseLibraryFXController.java e3c65d5785aedef2025c32f5da91943e446a09d6 GREEN
ReuseLibraryFXTreeTableUIProvider.java 47282c7631d8e43b03c7d1817c6cd767e25918e5 GREEN
ReuseLibraryFXContentProvider.java 4cd1ca617347c9edbcca0d7b3e0d3d6c1dbd6a38 GREEN
ReuseLibraryFXController.java f559c4bad03607089394c48b2517ac778812a91e GREEN
ReuseLibraryFXTreeTableUIProvider.java b7414ba62e6fe40358886b18906a87c92c0f75a6 GREEN
ReuseLibraryFXViewPart.java d4664c851e485e1d6c349a23952db69093ef25dc GREEN
......@@ -16,11 +16,11 @@
package org.fortiss.tooling.ext.reuse.ui.view.fx;
import static java.util.Collections.emptyList;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getFirstReuseElementUUID;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getReuseElementComment;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getReuseElementLastUpdateString;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getReuseElementName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.isCorrectReuseElementOrLibrary;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getFirstReuseElementUUID;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getReuseElementComment;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getReuseElementLastUpdateString;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getReuseElementName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.isCorrectReuseElementOrLibrary;
import java.util.ArrayList;
import java.util.Collection;
......
......@@ -16,7 +16,7 @@
package org.fortiss.tooling.ext.reuse.ui.view.fx;
import static java.util.Collections.emptyList;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getAllLocalReuseLibraries;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getAllLocalReuseLibraries;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
......
......@@ -17,17 +17,17 @@ package org.fortiss.tooling.ext.reuse.ui.view.fx;
import static org.conqat.ide.commons.ui.dialog.MessageUtils.confirm;
import static org.eclipse.jface.window.Window.OK;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.deleteReuseElementInLibraryFile;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.deleteReuseLibrary;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getAllLocalReuseLibraries;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getFirstReuseElementUUID;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getFirstSourceLibraryOfElement;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getLibraryIDName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getReuseElementComment;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getReuseElementLastUpdateString;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getReuseElementName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.updateReuseElementFileWithComment;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.updateReuseElementFileWithName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getAllLocalReuseLibraries;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getFirstReuseElementUUID;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getFirstSourceLibraryOfElement;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getLibraryIDName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getReuseElementComment;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getReuseElementLastUpdateString;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getReuseElementName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsManipulation.deleteReuseElementInLibraryFile;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsManipulation.deleteReuseLibrary;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsManipulation.updateReuseElementFileWithComment;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsManipulation.updateReuseElementFileWithName;
import java.util.ArrayList;
import java.util.List;
......
ReuseLibraryCompositor.java 184297737ee36bac8514687d0f5accf0d87d1159 GREEN
ReuseLibraryCompositor.java be959527c044c842362146503f4eddf2ea378f97 GREEN
......@@ -15,7 +15,7 @@
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.ext.reuse.compose;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.hasReusePossibility;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.hasReusePossibility;
import org.eclipse.emf.ecore.EObject;
import org.fortiss.tooling.base.compose.ModelElementCompositorBase;
......
ReuseLibraryModelElementFactory.java edac61169c3522577057a37b0e001153cea23e3b GREEN
ReuseLibraryUtils.java de2a7c79751c39b0b11a90cef858f60a7cc4680c RED
ReuseLibraryModelElementFactory.java 4ee3eb7449e212643992a3dec6cfb8f4278efb70 GREEN
ReuseLibraryUtilsBasics.java 9aa543630acf9555721821519d96d4356a07f341 YELLOW
ReuseLibraryUtilsManipulation.java 77a646db5a63ba7c61664dbcaf34a9036003fde5 YELLOW
......@@ -16,8 +16,8 @@
package org.fortiss.tooling.ext.reuse.utils;
import static org.eclipse.emf.ecore.util.EcoreUtil.generateUUID;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.createReuseHashAsString;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtils.getReuseElementName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsBasics.getReuseElementName;
import static org.fortiss.tooling.ext.reuse.utils.ReuseLibraryUtilsManipulation.createReuseHashAsString;
import java.time.ZonedDateTime;
import java.util.Random;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment