From abe01060045fa494c6520a7cb56e9f2c0638c048 Mon Sep 17 00:00:00 2001 From: Jonathan GEOFFROY Date: Thu, 7 Aug 2014 11:42:21 +0200 Subject: Bug 441326 - [java code generation] In preferences menu, empty path should not be added when user clicked on "cancel" button Change-Id: I2e6943b4967c3ce5be2dcdb2b3c9a2f2e9ce1f60 Signed-off-by: Jonathan GEOFFROY --- .../papyrus/java/generator/ui/preference/PackageListEditor.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/PackageListEditor.java b/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/PackageListEditor.java index dd8d8cf9519..cb3c44f05d8 100644 --- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/PackageListEditor.java +++ b/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/PackageListEditor.java @@ -20,6 +20,7 @@ import java.util.LinkedList; import java.util.List; import org.eclipse.jdt.internal.ui.preferences.TypeFilterInputDialog; +import org.eclipse.jface.dialogs.InputDialog; import org.eclipse.jface.preference.ListEditor; import org.eclipse.swt.widgets.Composite; @@ -56,6 +57,10 @@ public class PackageListEditor extends ListEditor { d.open(); Object pack = d.getResult(); + // Return null if user clicked on "cancel" button, to not add ampty package on the list + if(d.getReturnCode() == InputDialog.CANCEL) { + return null; + } return pack.toString(); } -- cgit v1.2.3