Attachment #115276 for bug #200878

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 200878
Collapse All | Expand All

Lines 210-215 Link Here

(-)a/maven/nbproject/project.xml (+8 lines)
210	</run-dependency>	210	</run-dependency>
211	</dependency>	211	</dependency>
212	<dependency>	212	<dependency>
		213	<code-name-base>org.netbeans.modules.options.java</code-name-base>
		214	<build-prerequisite/>
		215	<compile-dependency/>
		216	<run-dependency>
		217	<specification-version>1.0</specification-version>
		218	</run-dependency>
		219	</dependency>
		220	<dependency>
213	<code-name-base>org.netbeans.modules.project.ant</code-name-base>	221	<code-name-base>org.netbeans.modules.project.ant</code-name-base>
214	<build-prerequisite/>	222	<build-prerequisite/>
215	<compile-dependency/>	223	<compile-dependency/>

Lines 70-75 Link Here

(-)a/maven/src/org/netbeans/modules/maven/execute/AbstractMavenExecutor.java (-1 / +2 lines)
70	import static org.netbeans.modules.maven.execute.Bundle.*;	70	import static org.netbeans.modules.maven.execute.Bundle.*;
71	import org.netbeans.modules.maven.execute.ui.RunGoalsPanel;	71	import org.netbeans.modules.maven.execute.ui.RunGoalsPanel;
72	import org.netbeans.modules.maven.options.MavenOptionController;	72	import org.netbeans.modules.maven.options.MavenOptionController;
		73	import org.netbeans.modules.options.java.api.JavaOptions;
73	import org.netbeans.spi.project.ui.support.BuildExecutionSupport;	74	import org.netbeans.spi.project.ui.support.BuildExecutionSupport;
74	import org.openide.DialogDescriptor;	75	import org.openide.DialogDescriptor;
75	import org.openide.DialogDisplayer;	76	import org.openide.DialogDisplayer;
Lines 423-429 Link Here
423	}	424	}
424		425
425	@Override public void actionPerformed(ActionEvent e) {	426	@Override public void actionPerformed(ActionEvent e) {
426	OptionsDisplayer.getDefault().open(OptionsDisplayer.ADVANCED + "/" + MavenOptionController.OPTIONS_SUBPATH);	427	OptionsDisplayer.getDefault().open(JavaOptions.JAVA + "/" + MavenOptionController.OPTIONS_SUBPATH);
427	}	428	}
428		429
429	}	430	}

Lines 82-87 Link Here

(-)a/maven/src/org/netbeans/modules/maven/newproject/BasicPanelVisual.java (-1 / +2 lines)
82	import static org.netbeans.modules.maven.newproject.Bundle.*;	82	import static org.netbeans.modules.maven.newproject.Bundle.*;
83	import org.netbeans.modules.maven.options.MavenOptionController;	83	import org.netbeans.modules.maven.options.MavenOptionController;
84	import org.netbeans.modules.maven.options.MavenSettings;	84	import org.netbeans.modules.maven.options.MavenSettings;
		85	import org.netbeans.modules.options.java.api.JavaOptions;
85	import org.netbeans.spi.project.ui.support.ProjectChooser;	86	import org.netbeans.spi.project.ui.support.ProjectChooser;
86	import org.netbeans.validation.api.AbstractValidator;	87	import org.netbeans.validation.api.AbstractValidator;
87	import org.netbeans.validation.api.Problems;	88	import org.netbeans.validation.api.Problems;
Lines 444-450 Link Here
444	}//GEN-LAST:event_browseButtonActionPerformed	445	}//GEN-LAST:event_browseButtonActionPerformed
445		446
446	private void btnSetupNewerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSetupNewerActionPerformed	447	private void btnSetupNewerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSetupNewerActionPerformed
447	OptionsDisplayer.getDefault().open(OptionsDisplayer.ADVANCED + "/" + MavenOptionController.OPTIONS_SUBPATH); //NOI18N	448	OptionsDisplayer.getDefault().open(JavaOptions.JAVA + "/" + MavenOptionController.OPTIONS_SUBPATH); //NOI18N
448	panel.getValidationGroup().performValidation();	449	panel.getValidationGroup().performValidation();
449	}//GEN-LAST:event_btnSetupNewerActionPerformed	450	}//GEN-LAST:event_btnSetupNewerActionPerformed
450		451

Lines 55-60 Link Here

(-)a/maven/src/org/netbeans/modules/maven/output/GlobalOutputProcessor.java (-1 / +2 lines)
55	import org.netbeans.modules.maven.api.output.OutputVisitor;	55	import org.netbeans.modules.maven.api.output.OutputVisitor;
56	import org.netbeans.modules.maven.options.MavenOptionController;	56	import org.netbeans.modules.maven.options.MavenOptionController;
57	import static org.netbeans.modules.maven.output.Bundle.*;	57	import static org.netbeans.modules.maven.output.Bundle.*;
		58	import org.netbeans.modules.options.java.api.JavaOptions;
58	import org.openide.awt.HtmlBrowser.URLDisplayer;	59	import org.openide.awt.HtmlBrowser.URLDisplayer;
59	import org.openide.cookies.LineCookie;	60	import org.openide.cookies.LineCookie;
60	import org.openide.filesystems.FileObject;	61	import org.openide.filesystems.FileObject;
Lines 112-118 Link Here
112	visitor.setOutputListener(new OutputListener() {	113	visitor.setOutputListener(new OutputListener() {
113	@Override public void outputLineSelected(OutputEvent ev) {}	114	@Override public void outputLineSelected(OutputEvent ev) {}
114	@Override public void outputLineAction(OutputEvent ev) {	115	@Override public void outputLineAction(OutputEvent ev) {
115	OptionsDisplayer.getDefault().open(OptionsDisplayer.ADVANCED + "/" + MavenOptionController.OPTIONS_SUBPATH); //NOI18N	116	OptionsDisplayer.getDefault().open(JavaOptions.JAVA + "/" + MavenOptionController.OPTIONS_SUBPATH); //NOI18N
116	}	117	}
117	@Override public void outputLineCleared(OutputEvent ev) {}	118	@Override public void outputLineCleared(OutputEvent ev) {}
118	});	119	});

Lines 522-527 Link Here

(-)a/nbbuild/cluster.properties (+1 lines)
522	maven.spring,\	522	maven.spring,\
523	o.apache.tools.ant.module,\	523	o.apache.tools.ant.module,\
524	o.jdesktop.beansbinding,\	524	o.jdesktop.beansbinding,\
		525	options.java,\
525	projectimport.eclipse.core,\	526	projectimport.eclipse.core,\
526	projectimport.eclipse.j2se,\	527	projectimport.eclipse.j2se,\
527	refactoring.java,\	528	refactoring.java,\

Line 0 Link Here

(-)a/options.java/build.xml (+5 lines)
	1	<?xml version="1.0" encoding="UTF-8"?>
	2	<project basedir="." default="netbeans" name="options.java">
	3	<description>Builds, tests, and runs the project org.netbeans.modules.options.java</description>
	4	<import file="../nbbuild/templates/projectized.xml"/>
	5	</project>

Line 0 Link Here

(-)a/options.java/manifest.mf (+6 lines)
	1	Manifest-Version: 1.0
	2	AutoUpdate-Show-In-Client: false
	3	OpenIDE-Module: org.netbeans.modules.options.java
	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/options/java/Bundle.properties
	5	OpenIDE-Module-Specification-Version: 1.0
	6

Line 0 Link Here

(-)a/options.java/nbproject/project.properties (+2 lines)
	1	javac.source=1.6
	2	javac.compilerargs=-Xlint -Xlint:-serial




<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
    <type>org.netbeans.modules.apisupport.project</type>
    <configuration>
        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
            <code-name-base>org.netbeans.modules.options.java</code-name-base>
            <module-dependencies>
                <dependency>
                    <code-name-base>org.netbeans.modules.options.api</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.25</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>8.22</specification-version>
                    </run-dependency>
                </dependency>
            </module-dependencies>
            <friend-packages>
                <friend>org.apache.tools.ant.module</friend>
                <friend>org.netbeans.modules.debugger.jpda.ui</friend>
                <friend>org.netbeans.modules.form</friend>
                <friend>org.netbeans.modules.javacard.project</friend>
                <friend>org.netbeans.modules.maven</friend>
                <friend>org.netbeans.modules.profiler.options</friend>
                <friend>org.netbeans.modules.vmd.componentssupport</friend>
                <package>org.netbeans.modules.options.java.api</package>
            </friend-packages>
        </data>
    </configuration>
</project>

Line 0 Link Here

(-)a/options.java/src/org/netbeans/modules/options/java/Bundle.properties (+5 lines)
	1	OpenIDE-Module-Display-Category=Java
	2	OpenIDE-Module-Long-Description=\
	3	Provides Tools \| Options dialog Java primary panel and allows secondary panels to be registered.
	4	OpenIDE-Module-Name=Java Options
	5	OpenIDE-Module-Short-Description=Provides the Java primary panel in the Options dialog.




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2012 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2012 Sun Microsystems, Inc.
 */
package org.netbeans.modules.options.java.api;

/**
 *
 * @author theofanis
 */
public final class JavaOptions {
    /** Registration name of Java category. 
     * @since 1.0
     */
    public static final String JAVA = "Java"; // NOI18N
}

Lines 39-49 Link Here

(-)a/java.kit/src/org/netbeans/modules/java/options/package-info.java (-2 / +2 lines)
39	id = "Java",	39	id = "Java",
40	position = 610, //Keymap Container is at position 600 and PHP Container is at position 650	40	position = 610, //Keymap Container is at position 600 and PHP Container is at position 650
41	categoryName = "#OptionsCategory_Name_Java",	41	categoryName = "#OptionsCategory_Name_Java",
42	iconBase = "org/netbeans/modules/java/options/java_logo.png",	42	iconBase = "org/netbeans/modules/options/java/resources/java_logo.png",
43	keywords = "#OptionsCategory_Keywords_Java",	43	keywords = "#OptionsCategory_Keywords_Java",
44	keywordsCategory = "Java")	44	keywordsCategory = "Java")
45	@Messages({"OptionsCategory_Keywords_Java=Java Options","OptionsCategory_Name_Java=Java"})	45	@Messages({"OptionsCategory_Keywords_Java=Java Options","OptionsCategory_Name_Java=Java"})
46	package org.netbeans.modules.java.options;	46	package org.netbeans.modules.options.java.resources;
47		47
48	import org.netbeans.spi.options.OptionsPanelController;	48	import org.netbeans.spi.options.OptionsPanelController;
49	import org.openide.util.NbBundle.Messages;	49	import org.openide.util.NbBundle.Messages;

Return to bug 200878

Line 0 Link Here

(-)a/options.java/nbproject/project.xml (+38 lines)
	1	<?xml version="1.0" encoding="UTF-8"?>
	2	<project xmlns="http://www.netbeans.org/ns/project/1">
	3	<type>org.netbeans.modules.apisupport.project</type>
	4	<configuration>
	5	<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
	6	<code-name-base>org.netbeans.modules.options.java</code-name-base>
	7	<module-dependencies>
	8	<dependency>
	9	<code-name-base>org.netbeans.modules.options.api</code-name-base>
	10	<build-prerequisite/>
	11	<compile-dependency/>
	12	<run-dependency>
	13	<release-version>1</release-version>
	14	<specification-version>1.25</specification-version>
	15	</run-dependency>
	16	</dependency>
	17	<dependency>
	18	<code-name-base>org.openide.util</code-name-base>
	19	<build-prerequisite/>
	20	<compile-dependency/>
	21	<run-dependency>
	22	<specification-version>8.22</specification-version>
	23	</run-dependency>
	24	</dependency>
	25	</module-dependencies>
	26	<friend-packages>
	27	<friend>org.apache.tools.ant.module</friend>
	28	<friend>org.netbeans.modules.debugger.jpda.ui</friend>
	29	<friend>org.netbeans.modules.form</friend>
	30	<friend>org.netbeans.modules.javacard.project</friend>
	31	<friend>org.netbeans.modules.maven</friend>
	32	<friend>org.netbeans.modules.profiler.options</friend>
	33	<friend>org.netbeans.modules.vmd.componentssupport</friend>
	34	<package>org.netbeans.modules.options.java.api</package>
	35	</friend-packages>
	36	</data>
	37	</configuration>
	38	</project>

Line 0 Link Here

(-)a/options.java/src/org/netbeans/modules/options/java/api/JavaOptions.java (+53 lines)
	1	/*
	2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
	3	*
	4	* Copyright 2012 Oracle and/or its affiliates. All rights reserved.
	5	*
	6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
	7	* Other names may be trademarks of their respective owners.
	8	*
	9	* The contents of this file are subject to the terms of either the GNU
	10	* General Public License Version 2 only ("GPL") or the Common
	11	* Development and Distribution License("CDDL") (collectively, the
	12	* "License"). You may not use this file except in compliance with the
	13	* License. You can obtain a copy of the License at
	14	* http://www.netbeans.org/cddl-gplv2.html
	15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
	16	* specific language governing permissions and limitations under the
	17	* License. When distributing the software, include this License Header
	18	* Notice in each file and include the License file at
	19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
	20	* particular file as subject to the "Classpath" exception as provided
	21	* by Oracle in the GPL Version 2 section of the License file that
	22	* accompanied this code. If applicable, add the following below the
	23	* License Header, with the fields enclosed by brackets [] replaced by
	24	* your own identifying information:
	25	* "Portions Copyrighted [year] [name of copyright owner]"
	26	*
	27	* If you wish your version of this file to be governed by only the CDDL
	28	* or only the GPL Version 2, indicate your decision by adding
	29	* "[Contributor] elects to include this software in this distribution
	30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
	31	* single choice of license, a recipient has the option to distribute
	32	* your version of this file under either the CDDL, the GPL Version 2 or
	33	* to extend the choice of license to its licensees as provided above.
	34	* However, if you add GPL Version 2 code and therefore, elected the GPL
	35	* Version 2 license, then the option applies only if the new code is
	36	* made subject to such option by the copyright holder.
	37	*
	38	* Contributor(s):
	39	*
	40	* Portions Copyrighted 2012 Sun Microsystems, Inc.
	41	*/
	42	package org.netbeans.modules.options.java.api;
	43
	44	/**
	45	*
	46	* @author theofanis
	47	*/
	48	public final class JavaOptions {
	49	/** Registration name of Java category.
	50	* @since 1.0
	51	*/
	52	public static final String JAVA = "Java"; // NOI18N
	53	}