1.1 --- a/dew4nb/src/org/netbeans/modules/dew4nb/HiddenDisplayer.java Wed Jan 29 16:15:41 2014 +0100
1.2 +++ b/dew4nb/src/org/netbeans/modules/dew4nb/HiddenDisplayer.java Wed Jan 29 16:44:24 2014 +0100
1.3 @@ -63,13 +63,14 @@
1.4 return NotifyDescriptor.YES_OPTION;
1.5 }
1.6
1.7 - @Override
1.8 + @Override
1.9 public Dialog createDialog(DialogDescriptor descriptor) {
1.10 return new Dialog((Frame)null) {
1.11 @Override
1.12 public void setVisible(boolean b) {
1.13 }
1.14 - @Override
1.15 + @SuppressWarnings("deprecation")
1.16 + @Override
1.17 public void show() {
1.18 }
1.19 };
2.1 --- a/dew4nb/src/org/netbeans/modules/dew4nb/OpenProjectsWorkspaceResolver.java Wed Jan 29 16:15:41 2014 +0100
2.2 +++ b/dew4nb/src/org/netbeans/modules/dew4nb/OpenProjectsWorkspaceResolver.java Wed Jan 29 16:44:24 2014 +0100
2.3 @@ -67,7 +67,7 @@
2.4 * @author Tomas Zezula
2.5 */
2.6 @ServiceProvider(service = WorkspaceResolver.class, position = 10_000)
2.7 -public class OpenProjectsWorkspaceResolver implements WorkspaceResolver {
2.8 +public class OpenProjectsWorkspaceResolver extends WorkspaceResolver {
2.9
2.10 private static final Logger LOG = Logger.getLogger(OpenProjectsWorkspaceResolver.class.getName());
2.11
3.1 --- a/dew4nb/src/org/netbeans/modules/dew4nb/SourceProvider.java Wed Jan 29 16:15:41 2014 +0100
3.2 +++ b/dew4nb/src/org/netbeans/modules/dew4nb/SourceProvider.java Wed Jan 29 16:44:24 2014 +0100
3.3 @@ -109,7 +109,7 @@
3.4 @NullAllowed String content) {
3.5 FileObject file = null;
3.6 if (ctx != null) {
3.7 - final WorkspaceResolver resolver = Lookup.getDefault().lookup(WorkspaceResolver.class);
3.8 + final WorkspaceResolver resolver = WorkspaceResolver.getDefault();
3.9 if (resolver == null) {
3.10 LOG.warning("No WorkspaceResolver in Lookup."); //NOI18N
3.11 } else {
4.1 --- a/dew4nb/src/org/netbeans/modules/dew4nb/api/Server.java Wed Jan 29 16:15:41 2014 +0100
4.2 +++ b/dew4nb/src/org/netbeans/modules/dew4nb/api/Server.java Wed Jan 29 16:44:24 2014 +0100
4.3 @@ -196,7 +196,7 @@
4.4 if (index > 0) {
4.5 final String channel = text.substring(0, index);
4.6 final String message = text.substring(index+1);
4.7 - final EndPoint ep = registry.getEndPoint(channel);
4.8 + final EndPoint<?,?> ep = registry.getEndPoint(channel);
4.9 if (ep != null) {
4.10 try {
4.11 status = ep.handle(socket, message);
5.1 --- a/dew4nb/src/org/netbeans/modules/dew4nb/endpoint/EndPoint.java Wed Jan 29 16:15:41 2014 +0100
5.2 +++ b/dew4nb/src/org/netbeans/modules/dew4nb/endpoint/EndPoint.java Wed Jan 29 16:44:24 2014 +0100
5.3 @@ -190,7 +190,7 @@
5.4 synchronized (handlersCacheLock) {
5.5 if (handlersCache == null) {
5.6 final Map<String, Collection<RequestHandler<?,?>>> handlers = new HashMap<>();
5.7 - for (RequestHandler rh : Lookup.getDefault().lookupAll(RequestHandler.class)) {
5.8 + for (RequestHandler<?,?> rh : Lookup.getDefault().lookupAll(RequestHandler.class)) {
5.9 Collection<RequestHandler<?,?>> line = handlers.get(rh.endPointName);
5.10 if (line == null) {
5.11 line = new ArrayList<>();
6.1 --- a/dew4nb/src/org/netbeans/modules/dew4nb/endpoint/EndPointRegistry.java Wed Jan 29 16:15:41 2014 +0100
6.2 +++ b/dew4nb/src/org/netbeans/modules/dew4nb/endpoint/EndPointRegistry.java Wed Jan 29 16:44:24 2014 +0100
6.3 @@ -60,21 +60,21 @@
6.4 private final Lookup.Result<EndPoint> result;
6.5 private final Object lock = new Object();
6.6 //@GuardedBy("lock");
6.7 - private Map<String,EndPoint> endPointsCache;
6.8 + private Map<String,EndPoint<?,?>> endPointsCache;
6.9
6.10 private EndPointRegistry() {
6.11 this.result = Lookup.getDefault().lookupResult(EndPoint.class);
6.12 }
6.13
6.14 - public EndPoint getEndPoint(@NonNull final String name) {
6.15 + public EndPoint<?,?> getEndPoint(@NonNull final String name) {
6.16 Parameters.notNull("name", name); //NOI18N
6.17 synchronized (lock) {
6.18 if (endPointsCache == null) {
6.19 - Map<String,EndPoint> tmp = new HashMap<>();
6.20 - for (EndPoint ep : result.allInstances()) {
6.21 + Map<String,EndPoint<?,?>> tmp = new HashMap<>();
6.22 + for (EndPoint<?,?> ep : result.allInstances()) {
6.23 tmp.put(ep.getName(), ep);
6.24 }
6.25 - endPointsCache = Collections.unmodifiableMap(tmp);
6.26 + endPointsCache = Collections.<String,EndPoint<?,?>>unmodifiableMap(tmp);
6.27 }
6.28 return endPointsCache.get(name);
6.29 }
7.1 --- a/dew4nb/src/org/netbeans/modules/dew4nb/services/debugger/ActiveSessions.java Wed Jan 29 16:15:41 2014 +0100
7.2 +++ b/dew4nb/src/org/netbeans/modules/dew4nb/services/debugger/ActiveSessions.java Wed Jan 29 16:44:24 2014 +0100
7.3 @@ -188,7 +188,7 @@
7.4 res.setStatus(Status.done);
7.5 res.setType(DebugMessageType.suspended);
7.6 if (callStack != null) {
7.7 - final WorkspaceResolver wr = Lookup.getDefault().lookup(WorkspaceResolver.class);
7.8 + final WorkspaceResolver wr = WorkspaceResolver.getDefault();
7.9 if (wr == null) {
7.10 throw new IllegalStateException("No workspace resolver."); //NOI18N
7.11 }
8.1 --- a/dew4nb/src/org/netbeans/modules/dew4nb/services/debugger/AttachHandler.java Wed Jan 29 16:15:41 2014 +0100
8.2 +++ b/dew4nb/src/org/netbeans/modules/dew4nb/services/debugger/AttachHandler.java Wed Jan 29 16:44:24 2014 +0100
8.3 @@ -83,7 +83,7 @@
8.4 if (state == null) {
8.5 throw new IllegalArgumentException("Missing state"); //NOI18N
8.6 }
8.7 - final WorkspaceResolver resolver = Lookup.getDefault().lookup(WorkspaceResolver.class);
8.8 + final WorkspaceResolver resolver = WorkspaceResolver.getDefault();
8.9 if (resolver == null) {
8.10 throw new IllegalStateException("No WorkspaceResolver"); //NOI18N
8.11 }
9.1 --- a/dew4nb/src/org/netbeans/modules/dew4nb/services/debugger/SetBreakpointsHandler.java Wed Jan 29 16:15:41 2014 +0100
9.2 +++ b/dew4nb/src/org/netbeans/modules/dew4nb/services/debugger/SetBreakpointsHandler.java Wed Jan 29 16:44:24 2014 +0100
9.3 @@ -80,7 +80,7 @@
9.4 final int sessionId = request.getSession();
9.5 final WorkspaceResolver.Context ctx = ActiveSessions.getInstance().getContext(sessionId);
9.6 if (ctx != null) {
9.7 - final WorkspaceResolver resolver = Lookup.getDefault().lookup(WorkspaceResolver.class);
9.8 + final WorkspaceResolver resolver = WorkspaceResolver.getDefault();
9.9 if (resolver == null) {
9.10 throw new IllegalStateException("No WorkspaceResolver."); //NOI18N
9.11 }
10.1 --- a/dew4nb/src/org/netbeans/modules/dew4nb/services/javac/SymbolHandler.java Wed Jan 29 16:15:41 2014 +0100
10.2 +++ b/dew4nb/src/org/netbeans/modules/dew4nb/services/javac/SymbolHandler.java Wed Jan 29 16:44:24 2014 +0100
10.3 @@ -95,7 +95,7 @@
10.4 if (text != null) {
10.5 final Collection<? extends SymbolProvider> symProviders = getProviders();
10.6 try {
10.7 - final WorkspaceResolver resolver = Lookup.getDefault().lookup(WorkspaceResolver.class);
10.8 + final WorkspaceResolver resolver = WorkspaceResolver.getDefault();
10.9 if (resolver == null) {
10.10 throw new IllegalStateException("No WorkspaceResolver in Lookup"); //NOI18N
10.11 }
11.1 --- a/dew4nb/src/org/netbeans/modules/dew4nb/services/project/IORedirectProvider.java Wed Jan 29 16:15:41 2014 +0100
11.2 +++ b/dew4nb/src/org/netbeans/modules/dew4nb/services/project/IORedirectProvider.java Wed Jan 29 16:44:24 2014 +0100
11.3 @@ -148,6 +148,7 @@
11.4 }
11.5 }
11.6
11.7 + @SuppressWarnings("deprecation")
11.8 private static final class RedirectIO implements InputOutput {
11.9
11.10 private final AtomicBoolean closed;
11.11 @@ -216,7 +217,7 @@
11.12 public void setFocusTaken(boolean value) {
11.13 }
11.14
11.15 - @Override
11.16 + @Override
11.17 public Reader flushReader() {
11.18 return new NullReader();
11.19 }
12.1 --- a/dew4nb/src/org/netbeans/modules/dew4nb/services/project/InvokeProjectActionHandler.java Wed Jan 29 16:15:41 2014 +0100
12.2 +++ b/dew4nb/src/org/netbeans/modules/dew4nb/services/project/InvokeProjectActionHandler.java Wed Jan 29 16:44:24 2014 +0100
12.3 @@ -74,7 +74,7 @@
12.4 "Illegal message type: %s", //NOI18N
12.5 request.getType()));
12.6 }
12.7 - final WorkspaceResolver workspaceRes = Lookup.getDefault().lookup(WorkspaceResolver.class);
12.8 + final WorkspaceResolver workspaceRes = WorkspaceResolver.getDefault();
12.9 if (workspaceRes == null) {
12.10 throw new IllegalStateException("No WorkspaceResolver registered"); //NOI18N
12.11 }
13.1 --- a/dew4nb/src/org/netbeans/modules/dew4nb/services/project/IsProjectActionEnabledHandler.java Wed Jan 29 16:15:41 2014 +0100
13.2 +++ b/dew4nb/src/org/netbeans/modules/dew4nb/services/project/IsProjectActionEnabledHandler.java Wed Jan 29 16:44:24 2014 +0100
13.3 @@ -75,7 +75,7 @@
13.4 if (requestType != ProjectMessageType.isActionEnabled) {
13.5 throw new IllegalStateException(String.valueOf(requestType));
13.6 }
13.7 - final WorkspaceResolver resolver = Lookup.getDefault().lookup(WorkspaceResolver.class);
13.8 + final WorkspaceResolver resolver = WorkspaceResolver.getDefault();
13.9 if (resolver == null) {
13.10 throw new IllegalStateException("No WorkspaceResolver in Lookup"); //NOI18N
13.11 }
14.1 --- a/dew4nb/src/org/netbeans/modules/dew4nb/spi/WorkspaceResolver.java Wed Jan 29 16:15:41 2014 +0100
14.2 +++ b/dew4nb/src/org/netbeans/modules/dew4nb/spi/WorkspaceResolver.java Wed Jan 29 16:44:24 2014 +0100
14.3 @@ -46,18 +46,25 @@
14.4 import org.netbeans.api.annotations.common.CheckForNull;
14.5 import org.netbeans.api.annotations.common.NonNull;
14.6 import org.openide.filesystems.FileObject;
14.7 +import org.openide.util.Lookup;
14.8 import org.openide.util.Parameters;
14.9
14.10 /**
14.11 *
14.12 * @author Tomas Zezula
14.13 */
14.14 -public interface WorkspaceResolver {
14.15 +public abstract class WorkspaceResolver {
14.16 @CheckForNull
14.17 - FileObject resolveFile (@NonNull Context ctx);
14.18 + public abstract FileObject resolveFile (@NonNull Context ctx);
14.19
14.20 @CheckForNull
14.21 - Context resolveContext(@NonNull FileObject file);
14.22 + public abstract Context resolveContext(@NonNull FileObject file);
14.23 +
14.24 +
14.25 + @CheckForNull
14.26 + public static WorkspaceResolver getDefault() {
14.27 + return Lookup.getDefault().lookup(WorkspaceResolver.class);
14.28 + }
14.29
14.30 public static final class Context {
14.31