Merge branch 'no-legacy'

dscho · dscho · commit 0633f32405d5 · 2014-05-29T10:43:05.000-05:00
This topic branch is part of the multi-repository effort to mark
a couple plugins as incompatible with the LegacyUI.

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/src/main/java/org/scijava/plugins/commands/display/Close.java b/src/main/java/org/scijava/plugins/commands/display/Close.java
@@ -36,6 +36,7 @@
 import org.scijava.command.ContextCommand;
 import org.scijava.display.Display;
 import org.scijava.menu.MenuConstants;
+import org.scijava.plugin.Attr;
 import org.scijava.plugin.Menu;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
@@ -48,7 +49,7 @@
 @Plugin(type = Command.class, menu = {
 	@Menu(label = MenuConstants.FILE_LABEL, weight = MenuConstants.FILE_WEIGHT,
 		mnemonic = MenuConstants.FILE_MNEMONIC),
-	@Menu(label = "Close", weight = 16, mnemonic = 'c', accelerator = "^W") })
+	@Menu(label = "Close", weight = 16, mnemonic = 'c', accelerator = "^W") }, attrs = { @Attr(name = "no-legacy") })
 public class Close extends ContextCommand {
 
 	// -- Parameters --
diff --git a/src/main/java/org/scijava/plugins/commands/display/CloseAll.java b/src/main/java/org/scijava/plugins/commands/display/CloseAll.java
@@ -38,6 +38,7 @@
 import org.scijava.display.Display;
 import org.scijava.display.DisplayService;
 import org.scijava.menu.MenuConstants;
+import org.scijava.plugin.Attr;
 import org.scijava.plugin.Menu;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
@@ -50,7 +51,7 @@
 @Plugin(type = Command.class, menu = {
 	@Menu(label = MenuConstants.FILE_LABEL, weight = MenuConstants.FILE_WEIGHT,
 		mnemonic = MenuConstants.FILE_MNEMONIC),
-	@Menu(label = "Close All", weight = 17) })
+	@Menu(label = "Close All", weight = 17) }, attrs = { @Attr(name = "no-legacy") })
 public class CloseAll extends ContextCommand {
 
 	// -- Parameters --
diff --git a/src/main/java/org/scijava/plugins/commands/io/OpenFile.java b/src/main/java/org/scijava/plugins/commands/io/OpenFile.java
@@ -41,6 +41,7 @@
 import org.scijava.io.IOService;
 import org.scijava.log.LogService;
 import org.scijava.menu.MenuConstants;
+import org.scijava.plugin.Attr;
 import org.scijava.plugin.Menu;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
@@ -57,7 +58,7 @@
 	menu = {
 		@Menu(label = MenuConstants.FILE_LABEL, weight = MenuConstants.FILE_WEIGHT,
 			mnemonic = MenuConstants.FILE_MNEMONIC),
-		@Menu(label = "Open...", weight = 1, mnemonic = 'o', accelerator = "^O") })
+		@Menu(label = "Open...", weight = 1, mnemonic = 'o', accelerator = "^O") }, attrs = { @Attr(name = "no-legacy") })
 public class OpenFile extends ContextCommand {
 
 	@Parameter
