Skip to content

jnlp cleanup #9312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ebarboni wants to merge 3 commits into
base: master
Choose a base branch
from
Open

jnlp cleanup #9312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4133bf
jnlp cleanup
ebarboni Mar 30, 2026
f4d7c5e
project properties jnlp cleanup
ebarboni Mar 30, 2026
8a237e2
apisupport remove jnlp actions for project
ebarboni Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/Bundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ MSG_RemovingModuleMessage=<html>\
will be removed as well.
MSG_SuiteAlreadyContainsCNB=The suite already contains a project with code name base "{0}".
HINT_suite_project_root_node=Module suite project in {0}
LBL_jnlp_master=JNLP Descriptor

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

Expand Down
1 change: 0 additions & 1 deletion ...support.ant/src/org/netbeans/modules/apisupport/project/ui/ImportantFilesNodeFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,6 @@ private static final class SuiteImportantFilesChildren extends Children.Keys<Str
/** Abstract location to display name. */
private static final java.util.Map<String,String> FILES = new LinkedHashMap<String,String>();
static {
FILES.put("master.jnlp", NbBundle.getMessage(SuiteLogicalView.class,"LBL_jnlp_master"));
FILES.put("build.xml", NbBundle.getMessage(SuiteLogicalView.class,"LBL_build.xml"));
FILES.put("nbproject/project.properties", NbBundle.getMessage(SuiteLogicalView.class,"LBL_project.properties"));
FILES.put("nbproject/private/private.properties", NbBundle.getMessage(SuiteLogicalView.class,"LBL_private.properties"));
Expand Down
64 changes: 2 additions & 62 deletions apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/SuiteActions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,23 +79,18 @@
public final class SuiteActions implements ActionProvider, ExecProject {

private static final String COMMAND_BRANDING = "branding";
private static final String COMMAND_BUILD_JNLP = "build-jnlp";
private static final String COMMAND_BUILD_MAC = "build-mac";
private static final String COMMAND_BUILD_OSGI = "build-osgi";
private static final String COMMAND_BUILD_OSGI_OBR = "build-osgi-obr";
private static final String COMMAND_BUILD_ZIP = "build-zip";
private static final String COMMAND_DEBUG_JNLP = "debug-jnlp";
private static final String COMMAND_DEBUG_OSGI = "debug-osgi";
private static final String COMMAND_NBMS = "nbms";
private static final String COMMAND_PROFILE_OSGI = "profile-osgi";
private static final String COMMAND_RUN_JNLP = "run-jnlp";
private static final String COMMAND_RUN_OSGI = "run-osgi";
private static final String SUITE_ACTIONS_TYPE = "org-netbeans-modules-apisupport-project-suite";
private static final String SUITE_ACTIONS_PATH = "Projects/" + SUITE_ACTIONS_TYPE + "/Actions";
private static final String SUITE_PACKAGE_ACTIONS_TYPE = SUITE_ACTIONS_TYPE + "-package";
private static final String SUITE_PACKAGE_ACTIONS_PATH = "Projects/" + SUITE_PACKAGE_ACTIONS_TYPE + "/Actions";
private static final String SUITE_JNLP_ACTIONS_TYPE = SUITE_ACTIONS_TYPE + "-jnlp";
private static final String SUITE_JNLP_ACTIONS_PATH = "Projects/" + SUITE_JNLP_ACTIONS_TYPE + "/Actions";
private static final String SUITE_OSGI_ACTIONS_TYPE = SUITE_ACTIONS_TYPE + "-osgi";
private static final String SUITE_OSGI_ACTIONS_PATH = "Projects/" + SUITE_OSGI_ACTIONS_TYPE + "/Actions";
private static final RequestProcessor RP = new RequestProcessor(SuiteActions.class);
Expand Down Expand Up @@ -148,38 +143,6 @@ public static Action buildMac() {
return ProjectSensitiveActions.projectCommandAction(COMMAND_BUILD_MAC, SUITE_ACTION_mac(), null);
}

@ActionID(category="Project", id="org.netbeans.modules.apisupport.project.suite.jnlpMenu")
@ActionRegistration(displayName="#SUITE_ACTION_jnlp_menu", lazy=false)
@ActionReference(path=SUITE_ACTIONS_PATH, position=1300)
@Messages("SUITE_ACTION_jnlp_menu=JNLP")
public static Action jnlpMenu() {
return new SubMenuAction(SUITE_ACTION_jnlp_menu(), Arrays.asList(CommonProjectActions.forType(SUITE_JNLP_ACTIONS_TYPE)));
}

@ActionID(category="Project", id="org.netbeans.modules.apisupport.project.suite.buildJnlp")
@ActionRegistration(displayName="#SUITE_ACTION_build_jnlp", lazy=false)
@ActionReference(path=SUITE_JNLP_ACTIONS_PATH, position=100)
@Messages("SUITE_ACTION_build_jnlp=Build")
public static Action buildJnlp() {
return ProjectSensitiveActions.projectCommandAction(COMMAND_BUILD_JNLP, SUITE_ACTION_build_jnlp(), null);
}

@ActionID(category="Project", id="org.netbeans.modules.apisupport.project.suite.runJnlp")
@ActionRegistration(displayName="#SUITE_ACTION_run_jnlp", lazy=false)
@ActionReference(path=SUITE_JNLP_ACTIONS_PATH, position=200)
@Messages("SUITE_ACTION_run_jnlp=Run")
public static Action runJnlp() {
return ProjectSensitiveActions.projectCommandAction(COMMAND_RUN_JNLP, SUITE_ACTION_run_jnlp(), null);
}

@ActionID(category="Project", id="org.netbeans.modules.apisupport.project.suite.debugJnlp")
@ActionRegistration(displayName="#SUITE_ACTION_debug_jnlp", lazy=false)
@ActionReference(path=SUITE_JNLP_ACTIONS_PATH, position=300)
@Messages("SUITE_ACTION_debug_jnlp=Debug")
public static Action debugJnlp() {
return ProjectSensitiveActions.projectCommandAction(COMMAND_DEBUG_JNLP, SUITE_ACTION_debug_jnlp(), null);
}

@ActionID(category="Project", id="org.netbeans.modules.apisupport.project.suite.osgiMenu")
@ActionRegistration(displayName="#SUITE_ACTION_osgi_menu", lazy=false)
@ActionReference(path=SUITE_ACTIONS_PATH, position=1400)
Expand Down Expand Up @@ -296,9 +259,6 @@ public String[] getSupportedActions() {
ActionProvider.COMMAND_DEBUG,
ActionProvider.COMMAND_TEST,
COMMAND_BUILD_ZIP,
COMMAND_BUILD_JNLP,
COMMAND_RUN_JNLP,
COMMAND_DEBUG_JNLP,
COMMAND_BUILD_OSGI,
COMMAND_BUILD_OSGI_OBR,
COMMAND_RUN_OSGI,
Expand Down Expand Up @@ -416,21 +376,6 @@ public void run () {
return null;
}
targetNames = new String[] {COMMAND_BUILD_ZIP};
} else if (command.equals(COMMAND_BUILD_JNLP)) {
if (promptForAppName(PROMPT_FOR_APP_NAME_MODE_JNLP)) {
return null;
}
targetNames = new String[] {COMMAND_BUILD_JNLP};
} else if (command.equals(COMMAND_RUN_JNLP)) {
if (promptForAppName(PROMPT_FOR_APP_NAME_MODE_JNLP)) {
return null;
}
targetNames = new String[] {COMMAND_RUN_JNLP};
} else if (command.equals(COMMAND_DEBUG_JNLP)) {
if (promptForAppName(PROMPT_FOR_APP_NAME_MODE_JNLP)) {
return null;
}
targetNames = new String[] {COMMAND_DEBUG_JNLP};
} else {
targetNames = new String[] {command};
}
Expand All @@ -444,11 +389,9 @@ private static FileObject findBuildXml(SuiteProject project) {
return project.getProjectDirectory().getFileObject(GeneratedFilesHelper.BUILD_XML_PATH);
}

private static final int PROMPT_FOR_APP_NAME_MODE_JNLP = 0;
private static final int PROMPT_FOR_APP_NAME_MODE_ZIP = 1;
private static final int PROMPT_FOR_APP_NAME_MODE_ZIP = 1;
/** @return true if the dialog is shown */
@Messages({
"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.",
"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.",
"TITLE_app_name=Not Standalone Application",
"LBL_configure_app_name=Configure Application...",
Expand All @@ -462,10 +405,7 @@ private boolean promptForAppName(int mode) {

// #61372: warn the user, rather than disabling the action.
String msg;
switch (mode) {
case PROMPT_FOR_APP_NAME_MODE_JNLP:
msg = ERR_app_name_jnlp();
break;
switch (mode) {
case PROMPT_FOR_APP_NAME_MODE_ZIP:
msg = ERR_app_name_zip();
break;
Expand Down
2 changes: 0 additions & 2 deletions ...upport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/SuiteOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,6 @@ public List<FileObject> getMetadataFiles() {
List<FileObject> files = new ArrayList<FileObject>();
addFile(GeneratedFilesHelper.BUILD_XML_PATH, files);
addFile("nbproject", files); // NOI18N
addFile("master.jnlp", files); // NOI18N
addFile("branding.jnlp", files); // NOI18N
return files;
}

Expand Down
Loading
Loading