Skip to content

Commit 8a237e2

Browse files
ebarboniebarboni
committed
apisupport remove jnlp actions for project
1 parent f4d7c5e commit 8a237e2

9 files changed

Lines changed: 4015 additions & 751 deletions

File tree

‎apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/Bundle.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ MSG_RemovingModuleMessage=<html>\
7272
will be removed as well.
7373
MSG_SuiteAlreadyContainsCNB=The suite already contains a project with code name base "{0}".
7474
HINT_suite_project_root_node=Module suite project in {0}
75-
LBL_jnlp_master=JNLP Descriptor
7675

7776
Templates/Licenses/license-cddl-netbeans-sun.txt=NetBeans CDDL/GPL
7877

‎apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/ImportantFilesNodeFactory.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,6 @@ private static final class SuiteImportantFilesChildren extends Children.Keys<Str
302302
/** Abstract location to display name. */
303303
private static final java.util.Map<String,String> FILES = new LinkedHashMap<String,String>();
304304
static {
305-
FILES.put("master.jnlp", NbBundle.getMessage(SuiteLogicalView.class,"LBL_jnlp_master"));
306305
FILES.put("build.xml", NbBundle.getMessage(SuiteLogicalView.class,"LBL_build.xml"));
307306
FILES.put("nbproject/project.properties", NbBundle.getMessage(SuiteLogicalView.class,"LBL_project.properties"));
308307
FILES.put("nbproject/private/private.properties", NbBundle.getMessage(SuiteLogicalView.class,"LBL_private.properties"));

‎apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/SuiteActions.java‎

Lines changed: 2 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -79,23 +79,18 @@
7979
public final class SuiteActions implements ActionProvider, ExecProject {
8080

8181
private static final String COMMAND_BRANDING = "branding";
82-
private static final String COMMAND_BUILD_JNLP = "build-jnlp";
8382
private static final String COMMAND_BUILD_MAC = "build-mac";
8483
private static final String COMMAND_BUILD_OSGI = "build-osgi";
8584
private static final String COMMAND_BUILD_OSGI_OBR = "build-osgi-obr";
8685
private static final String COMMAND_BUILD_ZIP = "build-zip";
87-
private static final String COMMAND_DEBUG_JNLP = "debug-jnlp";
8886
private static final String COMMAND_DEBUG_OSGI = "debug-osgi";
8987
private static final String COMMAND_NBMS = "nbms";
9088
private static final String COMMAND_PROFILE_OSGI = "profile-osgi";
91-
private static final String COMMAND_RUN_JNLP = "run-jnlp";
9289
private static final String COMMAND_RUN_OSGI = "run-osgi";
9390
private static final String SUITE_ACTIONS_TYPE = "org-netbeans-modules-apisupport-project-suite";
9491
private static final String SUITE_ACTIONS_PATH = "Projects/" + SUITE_ACTIONS_TYPE + "/Actions";
9592
private static final String SUITE_PACKAGE_ACTIONS_TYPE = SUITE_ACTIONS_TYPE + "-package";
9693
private static final String SUITE_PACKAGE_ACTIONS_PATH = "Projects/" + SUITE_PACKAGE_ACTIONS_TYPE + "/Actions";
97-
private static final String SUITE_JNLP_ACTIONS_TYPE = SUITE_ACTIONS_TYPE + "-jnlp";
98-
private static final String SUITE_JNLP_ACTIONS_PATH = "Projects/" + SUITE_JNLP_ACTIONS_TYPE + "/Actions";
9994
private static final String SUITE_OSGI_ACTIONS_TYPE = SUITE_ACTIONS_TYPE + "-osgi";
10095
private static final String SUITE_OSGI_ACTIONS_PATH = "Projects/" + SUITE_OSGI_ACTIONS_TYPE + "/Actions";
10196
private static final RequestProcessor RP = new RequestProcessor(SuiteActions.class);
@@ -148,38 +143,6 @@ public static Action buildMac() {
148143
return ProjectSensitiveActions.projectCommandAction(COMMAND_BUILD_MAC, SUITE_ACTION_mac(), null);
149144
}
150145

151-
@ActionID(category="Project", id="org.netbeans.modules.apisupport.project.suite.jnlpMenu")
152-
@ActionRegistration(displayName="#SUITE_ACTION_jnlp_menu", lazy=false)
153-
@ActionReference(path=SUITE_ACTIONS_PATH, position=1300)
154-
@Messages("SUITE_ACTION_jnlp_menu=JNLP")
155-
public static Action jnlpMenu() {
156-
return new SubMenuAction(SUITE_ACTION_jnlp_menu(), Arrays.asList(CommonProjectActions.forType(SUITE_JNLP_ACTIONS_TYPE)));
157-
}
158-
159-
@ActionID(category="Project", id="org.netbeans.modules.apisupport.project.suite.buildJnlp")
160-
@ActionRegistration(displayName="#SUITE_ACTION_build_jnlp", lazy=false)
161-
@ActionReference(path=SUITE_JNLP_ACTIONS_PATH, position=100)
162-
@Messages("SUITE_ACTION_build_jnlp=Build")
163-
public static Action buildJnlp() {
164-
return ProjectSensitiveActions.projectCommandAction(COMMAND_BUILD_JNLP, SUITE_ACTION_build_jnlp(), null);
165-
}
166-
167-
@ActionID(category="Project", id="org.netbeans.modules.apisupport.project.suite.runJnlp")
168-
@ActionRegistration(displayName="#SUITE_ACTION_run_jnlp", lazy=false)
169-
@ActionReference(path=SUITE_JNLP_ACTIONS_PATH, position=200)
170-
@Messages("SUITE_ACTION_run_jnlp=Run")
171-
public static Action runJnlp() {
172-
return ProjectSensitiveActions.projectCommandAction(COMMAND_RUN_JNLP, SUITE_ACTION_run_jnlp(), null);
173-
}
174-
175-
@ActionID(category="Project", id="org.netbeans.modules.apisupport.project.suite.debugJnlp")
176-
@ActionRegistration(displayName="#SUITE_ACTION_debug_jnlp", lazy=false)
177-
@ActionReference(path=SUITE_JNLP_ACTIONS_PATH, position=300)
178-
@Messages("SUITE_ACTION_debug_jnlp=Debug")
179-
public static Action debugJnlp() {
180-
return ProjectSensitiveActions.projectCommandAction(COMMAND_DEBUG_JNLP, SUITE_ACTION_debug_jnlp(), null);
181-
}
182-
183146
@ActionID(category="Project", id="org.netbeans.modules.apisupport.project.suite.osgiMenu")
184147
@ActionRegistration(displayName="#SUITE_ACTION_osgi_menu", lazy=false)
185148
@ActionReference(path=SUITE_ACTIONS_PATH, position=1400)
@@ -296,9 +259,6 @@ public String[] getSupportedActions() {
296259
ActionProvider.COMMAND_DEBUG,
297260
ActionProvider.COMMAND_TEST,
298261
COMMAND_BUILD_ZIP,
299-
COMMAND_BUILD_JNLP,
300-
COMMAND_RUN_JNLP,
301-
COMMAND_DEBUG_JNLP,
302262
COMMAND_BUILD_OSGI,
303263
COMMAND_BUILD_OSGI_OBR,
304264
COMMAND_RUN_OSGI,
@@ -416,21 +376,6 @@ public void run () {
416376
return null;
417377
}
418378
targetNames = new String[] {COMMAND_BUILD_ZIP};
419-
} else if (command.equals(COMMAND_BUILD_JNLP)) {
420-
if (promptForAppName(PROMPT_FOR_APP_NAME_MODE_JNLP)) {
421-
return null;
422-
}
423-
targetNames = new String[] {COMMAND_BUILD_JNLP};
424-
} else if (command.equals(COMMAND_RUN_JNLP)) {
425-
if (promptForAppName(PROMPT_FOR_APP_NAME_MODE_JNLP)) {
426-
return null;
427-
}
428-
targetNames = new String[] {COMMAND_RUN_JNLP};
429-
} else if (command.equals(COMMAND_DEBUG_JNLP)) {
430-
if (promptForAppName(PROMPT_FOR_APP_NAME_MODE_JNLP)) {
431-
return null;
432-
}
433-
targetNames = new String[] {COMMAND_DEBUG_JNLP};
434379
} else {
435380
targetNames = new String[] {command};
436381
}
@@ -444,11 +389,9 @@ private static FileObject findBuildXml(SuiteProject project) {
444389
return project.getProjectDirectory().getFileObject(GeneratedFilesHelper.BUILD_XML_PATH);
445390
}
446391

447-
private static final int PROMPT_FOR_APP_NAME_MODE_JNLP = 0;
448-
private static final int PROMPT_FOR_APP_NAME_MODE_ZIP = 1;
392+
private static final int PROMPT_FOR_APP_NAME_MODE_ZIP = 1;
449393
/** @return true if the dialog is shown */
450394
@Messages({
451-
"ERR_app_name_jnlp=<html>The JNLP application cannot be built because this suite is not yet set up as a standalone application.<br>At least a branding name must be configured before building or running in JNLP mode.",
452395
"ERR_app_name_zip=<html>The ZIP file cannot be built because this suite is not yet set up as a standalone application.<br>At least a branding name must be configured before building an application ZIP.",
453396
"TITLE_app_name=Not Standalone Application",
454397
"LBL_configure_app_name=Configure Application...",
@@ -462,10 +405,7 @@ private boolean promptForAppName(int mode) {
462405

463406
// #61372: warn the user, rather than disabling the action.
464407
String msg;
465-
switch (mode) {
466-
case PROMPT_FOR_APP_NAME_MODE_JNLP:
467-
msg = ERR_app_name_jnlp();
468-
break;
408+
switch (mode) {
469409
case PROMPT_FOR_APP_NAME_MODE_ZIP:
470410
msg = ERR_app_name_zip();
471411
break;

‎apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/SuiteOperations.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,6 @@ public List<FileObject> getMetadataFiles() {
192192
List<FileObject> files = new ArrayList<FileObject>();
193193
addFile(GeneratedFilesHelper.BUILD_XML_PATH, files);
194194
addFile("nbproject", files); // NOI18N
195-
addFile("master.jnlp", files); // NOI18N
196-
addFile("branding.jnlp", files); // NOI18N
197195
return files;
198196
}
199197

0 commit comments

Comments
 (0)