Lines 58-67
Link Here
|
58 |
import org.netbeans.modules.glassfish.common.ServerDetails; |
58 |
import org.netbeans.modules.glassfish.common.ServerDetails; |
59 |
import org.netbeans.modules.glassfish.common.wizards.GlassfishWizardProvider; |
59 |
import org.netbeans.modules.glassfish.common.wizards.GlassfishWizardProvider; |
60 |
import org.netbeans.spi.server.ServerInstanceProvider; |
60 |
import org.netbeans.spi.server.ServerInstanceProvider; |
|
|
61 |
import org.openide.DialogDisplayer; |
62 |
import org.openide.NotifyDescriptor; |
61 |
import org.openide.WizardDescriptor; |
63 |
import org.openide.WizardDescriptor; |
62 |
import org.openide.filesystems.FileObject; |
64 |
import org.openide.filesystems.FileObject; |
63 |
import org.openide.filesystems.FileUtil; |
65 |
import org.openide.filesystems.FileUtil; |
64 |
import org.openide.util.Lookup; |
66 |
import org.openide.util.Lookup; |
|
|
67 |
import org.openide.util.NbBundle; |
65 |
|
68 |
|
66 |
|
69 |
|
67 |
/** |
70 |
/** |
Lines 89-98
Link Here
|
89 |
this.gwp = gwp; |
92 |
this.gwp = gwp; |
90 |
} |
93 |
} |
91 |
|
94 |
|
92 |
// public static ServerUtilities getPreludeUtilities() { |
95 |
/** |
93 |
// GlassfishInstanceProvider gip = GlassfishInstanceProvider.getPrelude(); |
96 |
* Display javaee module update warning. |
94 |
// return null == gip ? null : new ServerUtilities(gip,null); |
97 |
*/ |
95 |
// } |
98 |
private static void missingHk2LibraryProvider() { |
|
|
99 |
String message = NbBundle.getMessage(ServerUtilities.class, |
100 |
"ServerUtilities.updateModule"); |
101 |
NotifyDescriptor notifyDescriptor |
102 |
= new NotifyDescriptor.Message(message); |
103 |
DialogDisplayer.getDefault().notify(notifyDescriptor); |
104 |
} |
105 |
|
106 |
// Restored back using standard GF v3 settings because v3 Prelude |
107 |
// is not supported anymore. User gets warning to update javaee module. |
108 |
public static ServerUtilities getPreludeUtilities() { |
109 |
missingHk2LibraryProvider(); |
110 |
GlassfishInstanceProvider gip = GlassfishInstanceProvider.getProvider(); |
111 |
return null == gip ? null : new ServerUtilities(gip,null); |
112 |
} |
96 |
|
113 |
|
97 |
public static ServerUtilities getEe6Utilities() { |
114 |
public static ServerUtilities getEe6Utilities() { |
98 |
GlassfishInstanceProvider gip = GlassfishInstanceProvider.getProvider(); |
115 |
GlassfishInstanceProvider gip = GlassfishInstanceProvider.getProvider(); |