From 359b1b8e38141acd3f07abc5ada3c6b0161512db Mon Sep 17 00:00:00 2001 From: mka Date: Mon, 1 Apr 2013 16:51:26 +0000 Subject: [PATCH] "Remove the history" and "Set up-to-date" items are excluded from the pop-up menus in accordance with functional specification. --- .../org/splat/simer/ApplicationSettings.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java b/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java index 8b092a5..d1f9c55 100644 --- a/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java +++ b/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java @@ -228,7 +228,7 @@ public class ApplicationSettings { /** * Purge menu item name. */ - private static final String MNU_NAME_PURGE = "menu.purge"; + //private static final String MNU_NAME_PURGE = "menu.purge"; /** * Remove menu item name. */ @@ -599,9 +599,9 @@ public class ApplicationSettings { case remove: res = _user.canRemove(); break; - case purge: + /*case purge: res = _user.canPurge(); - break; + break;*/ case markasreference: if (_user.getOperand().getMarkreference() == 0) { res = _user.canMarkStudyAsReference(); @@ -646,9 +646,9 @@ public class ApplicationSettings { */ private EditableDocumentPopup() { super(); - addItem("accept", new PopupItem("menu.accept").icon( + /*addItem("accept", new PopupItem("menu.accept").icon( "image.accept.png").action("setDocument?action=accept") - .confirmation("message.accept.document")); + .confirmation("message.accept.document"));*/ addItem(MNU_PROMOTE, new PopupItem(MNU_NAME_PROMOTE).icon( "image.publish.png").action("setDocument?action=promote") .confirmation("message.promote.document")); @@ -664,9 +664,9 @@ public class ApplicationSettings { "image.replace.png").action( "select-file?nextAction=replace")); addSeparator(); - addItem(MNU_PURGE, new PopupItem(MNU_NAME_PURGE).action( + /*addItem(MNU_PURGE, new PopupItem(MNU_NAME_PURGE).action( ACT_NOT_YET_IMPLEMENTED).confirmation( - "message.purge.document")); + "message.purge.document"));*/ addItem(MNU_REMOVE, new PopupItem(MNU_NAME_REMOVE_VERSION).icon( IMG_DELETE).action("remove-document").confirmation( "message.delete.document")); @@ -678,9 +678,9 @@ public class ApplicationSettings { if (res) { Item item = Item.valueOf(name); switch (item) { - case accept: + /*case accept: res = _user.canAccept(); - break; + break;*/ case promote: res = _user.canPromote(); break; @@ -696,9 +696,9 @@ public class ApplicationSettings { case replace: res = _user.canReplace(); break; - case purge: + /*case purge: res = _user.canPurge(); - break; + break;*/ case remove: res = _user.canRemove(); break; @@ -751,9 +751,9 @@ public class ApplicationSettings { addItem(MNU_VERSION, new PopupItem(MNU_NAME_VERSION).icon( IMG_VERSION).action(ACT_VERSION)); addSeparator(); - addItem(MNU_PURGE, new PopupItem(MNU_NAME_PURGE).action( + /*addItem(MNU_PURGE, new PopupItem(MNU_NAME_PURGE).action( ACT_NOT_YET_IMPLEMENTED).confirmation( - "message.purge.document")); + "message.purge.document"));*/ } @Override @@ -774,9 +774,9 @@ public class ApplicationSettings { case version: res = _user.canVersion(); break; - case purge: + /*case purge: res = _user.canPurge(); - break; + break;*/ default: res = false; } @@ -807,9 +807,9 @@ public class ApplicationSettings { addItem(MNU_VERSION, new PopupItem(MNU_NAME_VERSION).icon( IMG_VERSION).action(ACT_VERSION)); addSeparator(); - addItem(MNU_PURGE, new PopupItem(MNU_NAME_PURGE).action( + /*addItem(MNU_PURGE, new PopupItem(MNU_NAME_PURGE).action( ACT_NOT_YET_IMPLEMENTED).confirmation( - "message.purge.document")); + "message.purge.document"));*/ addItem(MNU_REMOVE, new PopupItem(MNU_NAME_REMOVE_VERSION).icon( IMG_DELETE).action("remove-document").confirmation( "message.delete.document")); -- 2.39.2