diff -r abe767ecfd00 masterfs/src/org/netbeans/modules/masterfs/providers/AnnotationProvider.java --- a/masterfs/src/org/netbeans/modules/masterfs/providers/AnnotationProvider.java Thu Apr 17 07:00:06 2014 +0000 +++ b/masterfs/src/org/netbeans/modules/masterfs/providers/AnnotationProvider.java Fri Apr 18 12:40:34 2014 +0200 @@ -110,8 +110,12 @@ /** Provides actions that should be added to given set of files. * @param files an immutable set of {@link FileObject}s belonging to this filesystem * @return null or array of actions for these files. + * @deprecated no longer useful when {@link FileSystem# */ - public abstract javax.swing.Action[] actions(Set files); + @Deprecated + public javax.swing.Action[] actions(Set files) { + return null; + } // // Listener support diff -r abe767ecfd00 masterfs/src/org/netbeans/modules/masterfs/watcher/Watcher.java --- a/masterfs/src/org/netbeans/modules/masterfs/watcher/Watcher.java Thu Apr 17 07:00:06 2014 +0000 +++ b/masterfs/src/org/netbeans/modules/masterfs/watcher/Watcher.java Fri Apr 18 12:40:34 2014 +0200 @@ -148,9 +148,6 @@ public @Override String annotateNameHtml(String name, Set files) { return null; } - public @Override Action[] actions(Set files) { - return null; - } public @Override InterceptionListener getInterceptionListener() { return ext; diff -r abe767ecfd00 openide.filesystems/apichanges.xml --- a/openide.filesystems/apichanges.xml Thu Apr 17 07:00:06 2014 +0000 +++ b/openide.filesystems/apichanges.xml Fri Apr 18 12:40:34 2014 +0200 @@ -49,6 +49,26 @@ Filesystems API + + + Deprecating FileSystem.getActions + + + + + +

+ Deprecating getActions method in preparation + of splitting filesystems API into UI (e.g. depending + on Swing) and non-UI part (that can run on JDK8 compact + profile). +

+
+ + + + +
Allowed to reveal deleted files, or original files overriden by writable layer diff -r abe767ecfd00 openide.filesystems/manifest.mf --- a/openide.filesystems/manifest.mf Thu Apr 17 07:00:06 2014 +0000 +++ b/openide.filesystems/manifest.mf Fri Apr 18 12:40:34 2014 +0200 @@ -2,5 +2,5 @@ OpenIDE-Module: org.openide.filesystems OpenIDE-Module-Localizing-Bundle: org/openide/filesystems/Bundle.properties OpenIDE-Module-Layer: org/openide/filesystems/resources/layer.xml -OpenIDE-Module-Specification-Version: 8.11 +OpenIDE-Module-Specification-Version: 8.12 diff -r abe767ecfd00 openide.filesystems/src/org/openide/filesystems/AbstractFileSystem.java --- a/openide.filesystems/src/org/openide/filesystems/AbstractFileSystem.java Thu Apr 17 07:00:06 2014 +0000 +++ b/openide.filesystems/src/org/openide/filesystems/AbstractFileSystem.java Fri Apr 18 12:40:34 2014 +0200 @@ -273,8 +273,10 @@ /* Action for this filesystem. * * @return refresh action + * @deprecated actions should be provided by higher level parts of the + * system, not something as low level as filesystems */ - public SystemAction[] getActions() { + @Deprecated public SystemAction[] getActions() { if (!isEnabledRefreshFolder()) { return NO_SYSTEM_ACTIONS; } else { diff -r abe767ecfd00 openide.filesystems/src/org/openide/filesystems/FileSystem.java --- a/openide.filesystems/src/org/openide/filesystems/FileSystem.java Thu Apr 17 07:00:06 2014 +0000 +++ b/openide.filesystems/src/org/openide/filesystems/FileSystem.java Fri Apr 18 12:40:34 2014 +0200 @@ -476,15 +476,23 @@ * and {@link org.openide.util.actions.Presenter.Toolbar Toolbar} presenters. * * @return array of available actions + * @deprecated actions should be provided by higher level parts of the + * system, not something as low level as filesystems */ - public abstract SystemAction[] getActions(); + @Deprecated + public SystemAction[] getActions() { + return new SystemAction[0]; + } /** * Get actions appropriate to a certain file selection. * By default, returns the same list as {@link #getActions()}. * @param foSet one or more files which may be selected * @return zero or more actions appropriate to those files + * @deprecated actions should be provided by higher level parts of the + * system, not something as low level as filesystems */ + @Deprecated public SystemAction[] getActions(Set foSet) { return this.getActions(); } diff -r abe767ecfd00 openide.filesystems/src/org/openide/filesystems/MultiFileSystem.java --- a/openide.filesystems/src/org/openide/filesystems/MultiFileSystem.java Thu Apr 17 07:00:06 2014 +0000 +++ b/openide.filesystems/src/org/openide/filesystems/MultiFileSystem.java Fri Apr 18 12:40:34 2014 +0200 @@ -288,7 +288,10 @@ } /** Merge actions from all delegates. - */ + * @deprecated actions should be provided by higher level parts of the + * system, not something as low level as filesystems + */ + @Deprecated public @Override SystemAction[] getActions() { List al = new ArrayList(101); // randomly choosen constant Set uniq = new HashSet(101); // not that randommly choosen @@ -312,6 +315,13 @@ return al.toArray(new SystemAction[al.size()]); } + /** + * Merge actions from all delegates. + * + * @deprecated actions should be provided by higher level parts of the + * system, not something as low level as filesystems + */ + @Deprecated public @Override SystemAction[] getActions(final Set foSet) { List al = new ArrayList(101); // randomly choosen constant Set uniq = new HashSet(101); // not that randommly choosen diff -r abe767ecfd00 openide.loaders/src/org/openide/actions/FileSystemAction.java --- a/openide.loaders/src/org/openide/actions/FileSystemAction.java Thu Apr 17 07:00:06 2014 +0000 +++ b/openide.loaders/src/org/openide/actions/FileSystemAction.java Fri Apr 18 12:40:34 2014 +0200 @@ -65,7 +65,10 @@ * {@link FileSystem}. * * @author Jaroslav Tulach +* @deprecated uses {@link FileSystem#getActions(java.util.Set)} which is +* now deprecated */ +@Deprecated public class FileSystemAction extends SystemAction implements ContextAwareAction, Presenter.Menu, Presenter.Popup { /** empty array of menu items */ diff -r abe767ecfd00 subversion/test/unit/src/org/netbeans/modules/subversion/TestAnnotationProvider.java --- a/subversion/test/unit/src/org/netbeans/modules/subversion/TestAnnotationProvider.java Thu Apr 17 07:00:06 2014 +0000 +++ b/subversion/test/unit/src/org/netbeans/modules/subversion/TestAnnotationProvider.java Fri Apr 18 12:40:34 2014 +0200 @@ -112,11 +112,6 @@ } @Override - public Action[] actions(Set files) { - return new Action[]{}; - } - - @Override public InterceptionListener getInterceptionListener() { return interceptor; } diff -r abe767ecfd00 versioning.core/src/org/netbeans/modules/versioning/core/VersioningAnnotationProvider.java --- a/versioning.core/src/org/netbeans/modules/versioning/core/VersioningAnnotationProvider.java Thu Apr 17 07:00:06 2014 +0000 +++ b/versioning.core/src/org/netbeans/modules/versioning/core/VersioningAnnotationProvider.java Fri Apr 18 12:40:34 2014 +0200 @@ -118,6 +118,10 @@ } public Action[] actions(Set files) { + // + // XXX: And now what!? This code is really used in the IDE! + // + if (files.isEmpty()) return new Action[0]; if(!VersioningManager.isInitialized()) { diff -r abe767ecfd00 versioning.core/test/unit/src/org/netbeans/modules/versioning/DeleteCreateTestAnnotationProvider.java --- a/versioning.core/test/unit/src/org/netbeans/modules/versioning/DeleteCreateTestAnnotationProvider.java Thu Apr 17 07:00:06 2014 +0000 +++ b/versioning.core/test/unit/src/org/netbeans/modules/versioning/DeleteCreateTestAnnotationProvider.java Fri Apr 18 12:40:34 2014 +0200 @@ -111,11 +111,6 @@ } @Override - public Action[] actions(Set files) { - return new Action[]{}; - } - - @Override public InterceptionListener getInterceptionListener() { return interceptor; }