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 218312
Collapse All | Expand All

(-)a/bugtracking/manifest.mf (-1 / +1 lines)
Lines 3-7 Link Here
3
OpenIDE-Module: org.netbeans.modules.bugtracking
3
OpenIDE-Module: org.netbeans.modules.bugtracking
4
OpenIDE-Module-Layer: org/netbeans/modules/bugtracking/layer.xml
4
OpenIDE-Module-Layer: org/netbeans/modules/bugtracking/layer.xml
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/bugtracking/Bundle.properties
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/bugtracking/Bundle.properties
6
OpenIDE-Module-Specification-Version: 1.32
6
OpenIDE-Module-Specification-Version: 1.33
7
7
(-)a/bugtracking/nbproject/project.xml (-1 / +1 lines)
Lines 72-78 Link Here
72
                    <compile-dependency/>
72
                    <compile-dependency/>
73
                    <run-dependency>
73
                    <run-dependency>
74
                        <release-version>1</release-version>
74
                        <release-version>1</release-version>
75
                        <specification-version>1.11</specification-version>
75
                        <specification-version>1.28</specification-version>
76
                    </run-dependency>
76
                    </run-dependency>
77
                </dependency>
77
                </dependency>
78
                <dependency>
78
                <dependency>
(-)a/bugtracking/src/org/netbeans/modules/bugtracking/util/BugtrackingOptionsPanel.java (+3 lines)
Lines 47-57 Link Here
47
import java.awt.CardLayout;
47
import java.awt.CardLayout;
48
import javax.swing.DefaultListModel;
48
import javax.swing.DefaultListModel;
49
import javax.swing.JComponent;
49
import javax.swing.JComponent;
50
import org.netbeans.api.options.OptionsDisplayer;
51
import org.netbeans.spi.options.OptionsPanelController;
50
52
51
/**
53
/**
52
 *
54
 *
53
 * @author Tomas Stupka
55
 * @author Tomas Stupka
54
 */
56
 */
57
@OptionsPanelController.Keywords(keywords={"issue tracking"}, location=OptionsDisplayer.ADVANCED, tabTitle="#LBL_IssueTracking")
55
class BugtrackingOptionsPanel extends javax.swing.JPanel {
58
class BugtrackingOptionsPanel extends javax.swing.JPanel {
56
    
59
    
57
    /** Creates new form VcsAdvancedOptionsPanel */
60
    /** Creates new form VcsAdvancedOptionsPanel */
(-)a/bugzilla/manifest.mf (-1 / +1 lines)
Lines 3-7 Link Here
3
OpenIDE-Module: org.netbeans.modules.bugzilla
3
OpenIDE-Module: org.netbeans.modules.bugzilla
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/bugzilla/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/bugzilla/Bundle.properties
5
OpenIDE-Module-Layer: org/netbeans/modules/bugzilla/layer.xml
5
OpenIDE-Module-Layer: org/netbeans/modules/bugzilla/layer.xml
6
OpenIDE-Module-Specification-Version: 1.28
6
OpenIDE-Module-Specification-Version: 1.29
7
7
(-)a/bugzilla/nbproject/project.xml (-1 / +1 lines)
Lines 117-123 Link Here
117
                    <compile-dependency/>
117
                    <compile-dependency/>
118
                    <run-dependency>
118
                    <run-dependency>
119
                        <release-version>1</release-version>
119
                        <release-version>1</release-version>
120
                        <specification-version>1.11</specification-version>
120
                        <specification-version>1.28</specification-version>
121
                    </run-dependency>
121
                    </run-dependency>
122
                </dependency>
122
                </dependency>
123
                <dependency>
123
                <dependency>
(-)a/bugzilla/src/org/netbeans/modules/bugzilla/options/BugzillaOptionsPanel.java (+3 lines)
Lines 46-57 Link Here
46
import java.awt.Color;
46
import java.awt.Color;
47
import java.awt.Image;
47
import java.awt.Image;
48
import javax.swing.ImageIcon;
48
import javax.swing.ImageIcon;
49
import org.netbeans.api.options.OptionsDisplayer;
50
import org.netbeans.spi.options.OptionsPanelController;
49
import org.openide.util.ImageUtilities;
51
import org.openide.util.ImageUtilities;
50
52
51
/**
53
/**
52
 *
54
 *
53
 * @author Tomas Stupka
55
 * @author Tomas Stupka
54
 */
56
 */
57
@OptionsPanelController.Keywords(keywords={"bugzilla", "issue tracking"}, location=OptionsDisplayer.ADVANCED, tabTitle="Issue Tracking")
55
public class BugzillaOptionsPanel extends javax.swing.JPanel {
58
public class BugzillaOptionsPanel extends javax.swing.JPanel {
56
59
57
    /** Creates new form SvnOptionsPanel */
60
    /** Creates new form SvnOptionsPanel */
(-)a/core.output2/manifest.mf (-1 / +1 lines)
Lines 4-8 Link Here
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/core/output2/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/core/output2/Bundle.properties
5
OpenIDE-Module-Provides: org.openide.windows.IOProvider
5
OpenIDE-Module-Provides: org.openide.windows.IOProvider
6
AutoUpdate-Essential-Module: true
6
AutoUpdate-Essential-Module: true
7
OpenIDE-Module-Specification-Version: 1.27
7
OpenIDE-Module-Specification-Version: 1.28
8
8
(-)a/core.output2/nbproject/project.xml (-1 / +1 lines)
Lines 55-61 Link Here
55
                    <compile-dependency/>
55
                    <compile-dependency/>
56
                    <run-dependency>
56
                    <run-dependency>
57
                        <release-version>1</release-version>
57
                        <release-version>1</release-version>
58
                        <specification-version>1.27</specification-version>
58
                        <specification-version>1.28</specification-version>
59
                    </run-dependency>
59
                    </run-dependency>
60
                </dependency>
60
                </dependency>
61
                <dependency>
61
                <dependency>
(-)a/core.output2/src/org/netbeans/core/output2/options/OutputSettingsPanel.java (+3 lines)
Lines 50-57 Link Here
50
import java.io.IOException;
50
import java.io.IOException;
51
import javax.swing.Action;
51
import javax.swing.Action;
52
import javax.swing.JComboBox;
52
import javax.swing.JComboBox;
53
import org.netbeans.api.options.OptionsDisplayer;
53
import org.netbeans.core.output2.Controller;
54
import org.netbeans.core.output2.Controller;
54
import org.netbeans.core.output2.NbIOProvider;
55
import org.netbeans.core.output2.NbIOProvider;
56
import org.netbeans.spi.options.OptionsPanelController;
55
import org.openide.DialogDescriptor;
57
import org.openide.DialogDescriptor;
56
import org.openide.DialogDisplayer;
58
import org.openide.DialogDisplayer;
57
import org.openide.awt.ColorComboBox;
59
import org.openide.awt.ColorComboBox;
Lines 68-73 Link Here
68
@NbBundle.Messages({
70
@NbBundle.Messages({
69
    "LBL_Description=Output Window Settings"
71
    "LBL_Description=Output Window Settings"
70
})
72
})
73
@OptionsPanelController.Keywords(keywords={"Output Window Font Color"}, location=OptionsDisplayer.ADVANCED, tabTitle="Output")
71
public final class OutputSettingsPanel extends javax.swing.JPanel {
74
public final class OutputSettingsPanel extends javax.swing.JPanel {
72
75
73
    private OutputOptions outputOptions;
76
    private OutputOptions outputOptions;
(-)a/core.ui/manifest.mf (-1 / +1 lines)
Lines 4-8 Link Here
4
OpenIDE-Module-Layer: org/netbeans/core/ui/resources/layer.xml
4
OpenIDE-Module-Layer: org/netbeans/core/ui/resources/layer.xml
5
AutoUpdate-Show-In-Client: false
5
AutoUpdate-Show-In-Client: false
6
AutoUpdate-Essential-Module: true
6
AutoUpdate-Essential-Module: true
7
OpenIDE-Module-Specification-Version: 1.32
7
OpenIDE-Module-Specification-Version: 1.33
8
8
(-)a/core.ui/nbproject/project.xml (-1 / +1 lines)
Lines 73-79 Link Here
73
                    <compile-dependency/>
73
                    <compile-dependency/>
74
                    <run-dependency>
74
                    <run-dependency>
75
                        <release-version>1</release-version>
75
                        <release-version>1</release-version>
76
                        <specification-version>1.5</specification-version>
76
                        <specification-version>1.28</specification-version>
77
                    </run-dependency>
77
                    </run-dependency>
78
                </dependency>
78
                </dependency>
79
                <dependency>
79
                <dependency>
(-)a/core.ui/src/org/netbeans/core/ui/options/filetypes/FileAssociationsPanel.java (+3 lines)
Lines 48-54 Link Here
48
import java.util.prefs.Preferences;
48
import java.util.prefs.Preferences;
49
import javax.swing.event.DocumentEvent;
49
import javax.swing.event.DocumentEvent;
50
import javax.swing.event.DocumentListener;
50
import javax.swing.event.DocumentListener;
51
import org.netbeans.api.options.OptionsDisplayer;
51
import org.netbeans.core.ui.options.filetypes.FileAssociationsModel.MimeItem;
52
import org.netbeans.core.ui.options.filetypes.FileAssociationsModel.MimeItem;
53
import org.netbeans.spi.options.OptionsPanelController;
52
import org.openide.DialogDescriptor;
54
import org.openide.DialogDescriptor;
53
import org.openide.DialogDisplayer;
55
import org.openide.DialogDisplayer;
54
import org.openide.util.NbBundle;
56
import org.openide.util.NbBundle;
Lines 58-63 Link Here
58
 *
60
 *
59
 * @author Jiri Skrivanek
61
 * @author Jiri Skrivanek
60
 */
62
 */
63
@OptionsPanelController.Keywords(keywords={"#KW_FilesOptions"}, location=OptionsDisplayer.ADVANCED, tabTitle="#AdvancedOption.displayName")
61
final class FileAssociationsPanel extends javax.swing.JPanel {
64
final class FileAssociationsPanel extends javax.swing.JPanel {
62
65
63
    private final FileAssociationsOptionsPanelController controller;
66
    private final FileAssociationsOptionsPanelController controller;
(-)a/core.ui/src/org/netbeans/core/ui/options/general/AdvancedProxyPanel.java (+3 lines)
Lines 45-50 Link Here
45
45
46
import javax.swing.event.DocumentEvent;
46
import javax.swing.event.DocumentEvent;
47
import javax.swing.event.DocumentListener;
47
import javax.swing.event.DocumentListener;
48
import org.netbeans.api.options.OptionsDisplayer;
49
import org.netbeans.spi.options.OptionsPanelController;
48
import org.openide.DialogDescriptor;
50
import org.openide.DialogDescriptor;
49
import org.openide.NotificationLineSupport;
51
import org.openide.NotificationLineSupport;
50
52
Lines 52-57 Link Here
52
 *
54
 *
53
 * @author  Jiri Rechtacek
55
 * @author  Jiri Rechtacek
54
 */
56
 */
57
@OptionsPanelController.Keywords(keywords={"advanced proxy"}, location=OptionsDisplayer.GENERAL)
55
public class AdvancedProxyPanel extends javax.swing.JPanel {
58
public class AdvancedProxyPanel extends javax.swing.JPanel {
56
    private GeneralOptionsModel options;
59
    private GeneralOptionsModel options;
57
    private String oldHttpsHost;
60
    private String oldHttpsHost;
(-)a/core.ui/src/org/netbeans/core/ui/options/general/GeneralOptionsPanel.java (+2 lines)
Lines 60-65 Link Here
60
import javax.swing.UIManager;
60
import javax.swing.UIManager;
61
import javax.swing.event.DocumentEvent;
61
import javax.swing.event.DocumentEvent;
62
import javax.swing.event.DocumentListener;
62
import javax.swing.event.DocumentListener;
63
import org.netbeans.api.options.OptionsDisplayer;
63
import org.netbeans.beaninfo.editors.HtmlBrowser;
64
import org.netbeans.beaninfo.editors.HtmlBrowser;
64
import org.netbeans.core.ProxySettings;
65
import org.netbeans.core.ProxySettings;
65
import org.netbeans.spi.options.OptionsPanelController;
66
import org.netbeans.spi.options.OptionsPanelController;
Lines 75-80 Link Here
75
 *
76
 *
76
 * @author Jan Jancura
77
 * @author Jan Jancura
77
 */
78
 */
79
@OptionsPanelController.Keywords(keywords={"#KW_General"}, location=OptionsDisplayer.GENERAL)
78
public class GeneralOptionsPanel extends JPanel implements ActionListener {
80
public class GeneralOptionsPanel extends JPanel implements ActionListener {
79
    
81
    
80
    private boolean                 changed = false;
82
    private boolean                 changed = false;
(-)a/core.ui/src/org/netbeans/core/ui/options/general/WebBrowsersOptionsPanel.java (+3 lines)
Lines 39-51 Link Here
39
import javax.swing.event.ListSelectionEvent;
39
import javax.swing.event.ListSelectionEvent;
40
import javax.swing.event.ListSelectionListener;
40
import javax.swing.event.ListSelectionListener;
41
import javax.swing.text.Document;
41
import javax.swing.text.Document;
42
import org.netbeans.api.options.OptionsDisplayer;
42
import org.netbeans.core.ui.options.general.WebBrowsersOptionsModel.PropertyPanelDesc;
43
import org.netbeans.core.ui.options.general.WebBrowsersOptionsModel.PropertyPanelDesc;
44
import org.netbeans.spi.options.OptionsPanelController;
43
45
44
/**
46
/**
45
 * Panel for customization of web browser preffered property
47
 * Panel for customization of web browser preffered property
46
 * 
48
 * 
47
 * @author Milan Kubec
49
 * @author Milan Kubec
48
 */
50
 */
51
@OptionsPanelController.Keywords(keywords={"web browser"}, location=OptionsDisplayer.GENERAL)
49
public class WebBrowsersOptionsPanel extends JPanel implements ListSelectionListener {
52
public class WebBrowsersOptionsPanel extends JPanel implements ListSelectionListener {
50
    
53
    
51
    private WebBrowsersOptionsModel browsersModel;
54
    private WebBrowsersOptionsModel browsersModel;
(-)a/core.windows/manifest.mf (-1 / +1 lines)
Lines 6-10 Link Here
6
OpenIDE-Module-Recommends: org.netbeans.core.windows.nativeaccess.NativeWindowSystem
6
OpenIDE-Module-Recommends: org.netbeans.core.windows.nativeaccess.NativeWindowSystem
7
AutoUpdate-Show-In-Client: false
7
AutoUpdate-Show-In-Client: false
8
AutoUpdate-Essential-Module: true
8
AutoUpdate-Essential-Module: true
9
OpenIDE-Module-Specification-Version: 2.54
9
OpenIDE-Module-Specification-Version: 2.55
10
10
(-)a/core.windows/nbproject/project.xml (-1 / +1 lines)
Lines 64-70 Link Here
64
                    <compile-dependency/>
64
                    <compile-dependency/>
65
                    <run-dependency>
65
                    <run-dependency>
66
                        <release-version>1</release-version>
66
                        <release-version>1</release-version>
67
                        <specification-version>1.6</specification-version>
67
                        <specification-version>1.28</specification-version>
68
                    </run-dependency>
68
                    </run-dependency>
69
                </dependency>
69
                </dependency>
70
                <dependency>
70
                <dependency>
(-)a/core.windows/src/org/netbeans/core/windows/options/WinSysPanel.java (+3 lines)
Lines 49-60 Link Here
49
import java.util.prefs.Preferences;
49
import java.util.prefs.Preferences;
50
import javax.swing.JTabbedPane;
50
import javax.swing.JTabbedPane;
51
import javax.swing.UIManager;
51
import javax.swing.UIManager;
52
import org.netbeans.api.options.OptionsDisplayer;
52
import org.netbeans.core.windows.FloatingWindowTransparencyManager;
53
import org.netbeans.core.windows.FloatingWindowTransparencyManager;
53
import org.netbeans.core.windows.nativeaccess.NativeWindowSystem;
54
import org.netbeans.core.windows.nativeaccess.NativeWindowSystem;
55
import org.netbeans.spi.options.OptionsPanelController;
54
import org.openide.util.NbBundle;
56
import org.openide.util.NbBundle;
55
import org.openide.util.NbPreferences;
57
import org.openide.util.NbPreferences;
56
import org.openide.util.Utilities;
58
import org.openide.util.Utilities;
57
59
60
@OptionsPanelController.Keywords(keywords={"#AdvancedOption_DisplayName_WinSys"}, location=OptionsDisplayer.ADVANCED, tabTitle="#AdvancedOption_DisplayName_WinSys")
58
final class WinSysPanel extends javax.swing.JPanel {
61
final class WinSysPanel extends javax.swing.JPanel {
59
62
60
    private final WinSysOptionsPanelController controller;
63
    private final WinSysOptionsPanelController controller;
(-)a/debugger.jpda.ui/manifest.mf (-1 / +1 lines)
Lines 3-9 Link Here
3
OpenIDE-Module: org.netbeans.modules.debugger.jpda.ui/1
3
OpenIDE-Module: org.netbeans.modules.debugger.jpda.ui/1
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/debugger/jpda/ui/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/debugger/jpda/ui/Bundle.properties
5
OpenIDE-Module-Layer: org/netbeans/modules/debugger/jpda/resources/mf-layer.xml
5
OpenIDE-Module-Layer: org/netbeans/modules/debugger/jpda/resources/mf-layer.xml
6
OpenIDE-Module-Specification-Version: 1.27
6
OpenIDE-Module-Specification-Version: 1.28
7
OpenIDE-Module-Requires: org.netbeans.api.debugger.jpda.JPDADebuggerEngineImpl,
7
OpenIDE-Module-Requires: org.netbeans.api.debugger.jpda.JPDADebuggerEngineImpl,
8
  org.netbeans.spi.debugger.ui
8
  org.netbeans.spi.debugger.ui
9
OpenIDE-Module-Provides: org.netbeans.modules.debugger.jpda.ui
9
OpenIDE-Module-Provides: org.netbeans.modules.debugger.jpda.ui
(-)a/debugger.jpda.ui/nbproject/project.xml (-1 / +1 lines)
Lines 174-180 Link Here
174
                    <compile-dependency/>
174
                    <compile-dependency/>
175
                    <run-dependency>
175
                    <run-dependency>
176
                        <release-version>1</release-version>
176
                        <release-version>1</release-version>
177
                        <specification-version>1.11</specification-version>
177
                        <specification-version>1.28</specification-version>
178
                    </run-dependency>
178
                    </run-dependency>
179
                </dependency>
179
                </dependency>
180
                <dependency>
180
                <dependency>
(-)a/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/options/JavaDebuggerPanel.java (+3 lines)
Lines 43-51 Link Here
43
package org.netbeans.modules.debugger.jpda.ui.options;
43
package org.netbeans.modules.debugger.jpda.ui.options;
44
44
45
import java.util.Collection;
45
import java.util.Collection;
46
import org.netbeans.modules.options.java.api.JavaOptions;
47
import org.netbeans.spi.options.OptionsPanelController;
46
import org.openide.util.NbBundle;
48
import org.openide.util.NbBundle;
47
import org.openide.util.lookup.Lookups;
49
import org.openide.util.lookup.Lookups;
48
50
51
@OptionsPanelController.Keywords(keywords={"java debugger"}, location=JavaOptions.JAVA, index=3)
49
final class JavaDebuggerPanel extends StorablePanel {
52
final class JavaDebuggerPanel extends StorablePanel {
50
53
51
    private static final String SHOW_FORMATTERS_PROP_NAME = "org.netbeans.modules.debugger.jpda.ui.options.SHOW_FORMATTERS";
54
    private static final String SHOW_FORMATTERS_PROP_NAME = "org.netbeans.modules.debugger.jpda.ui.options.SHOW_FORMATTERS";
(-)a/diff/nbproject/project.properties (-1 / +1 lines)
Lines 43-49 Link Here
43
javac.compilerargs=-Xlint:unchecked
43
javac.compilerargs=-Xlint:unchecked
44
javac.source=1.6
44
javac.source=1.6
45
45
46
spec.version.base=1.38.0
46
spec.version.base=1.39.0
47
javadoc.apichanges=${basedir}/apichanges.xml
47
javadoc.apichanges=${basedir}/apichanges.xml
48
javadoc.arch=${basedir}/arch.xml
48
javadoc.arch=${basedir}/arch.xml
49
49
(-)a/diff/nbproject/project.xml (-1 / +1 lines)
Lines 124-130 Link Here
124
                    <compile-dependency/>
124
                    <compile-dependency/>
125
                    <run-dependency>
125
                    <run-dependency>
126
                        <release-version>1</release-version>
126
                        <release-version>1</release-version>
127
                        <specification-version>1.8</specification-version>
127
                        <specification-version>1.28</specification-version>
128
                    </run-dependency>
128
                    </run-dependency>
129
                </dependency>
129
                </dependency>
130
                <dependency>
130
                <dependency>
(-)a/diff/src/org/netbeans/modules/diff/options/DiffColorsPanel.java (+3 lines)
Lines 62-67 Link Here
62
import java.beans.PropertyChangeListener;
62
import java.beans.PropertyChangeListener;
63
import java.beans.PropertyChangeEvent;
63
import java.beans.PropertyChangeEvent;
64
import java.util.*;
64
import java.util.*;
65
import org.netbeans.api.options.OptionsDisplayer;
66
import org.netbeans.spi.options.OptionsPanelController;
65
67
66
/**
68
/**
67
 * Copied from org.netbeans.modules.options.colors.HighlightingPanel
69
 * Copied from org.netbeans.modules.options.colors.HighlightingPanel
Lines 69-74 Link Here
69
 * copied from editor/options.
71
 * copied from editor/options.
70
 * @author Maros Sandor
72
 * @author Maros Sandor
71
 */
73
 */
74
@OptionsPanelController.Keywords(keywords={"diff colors"}, location=OptionsDisplayer.FONTSANDCOLORS, index=3)
72
public class DiffColorsPanel extends javax.swing.JPanel implements ActionListener, FontsColorsController, PropertyChangeListener {
75
public class DiffColorsPanel extends javax.swing.JPanel implements ActionListener, FontsColorsController, PropertyChangeListener {
73
    
76
    
74
    private static final String ATTR_NAME_ADDED = "added";
77
    private static final String ATTR_NAME_ADDED = "added";
(-)a/diff/src/org/netbeans/modules/diff/options/DiffOptionsPanel.java (+3 lines)
Lines 53-64 Link Here
53
import javax.swing.event.DocumentEvent;
53
import javax.swing.event.DocumentEvent;
54
import javax.swing.*;
54
import javax.swing.*;
55
import java.io.File;
55
import java.io.File;
56
import org.netbeans.api.options.OptionsDisplayer;
57
import org.netbeans.spi.options.OptionsPanelController;
56
58
57
/**
59
/**
58
 * Diff Options panel.
60
 * Diff Options panel.
59
 *
61
 *
60
 * @author  Maros Sandor
62
 * @author  Maros Sandor
61
 */
63
 */
64
@OptionsPanelController.Keywords(keywords={"diff"}, location=OptionsDisplayer.ADVANCED, tabTitle="Diff")
62
class DiffOptionsPanel extends javax.swing.JPanel implements ChangeListener, DocumentListener {
65
class DiffOptionsPanel extends javax.swing.JPanel implements ChangeListener, DocumentListener {
63
66
64
    private boolean isChanged;
67
    private boolean isChanged;
(-)a/editor.codetemplates/nbproject/project.properties (-1 / +1 lines)
Lines 45-50 Link Here
45
#javadoc.name=EditorCodeTemplates
45
#javadoc.name=EditorCodeTemplates
46
javadoc.apichanges=${basedir}/apichanges.xml
46
javadoc.apichanges=${basedir}/apichanges.xml
47
javadoc.arch=${basedir}/arch.xml
47
javadoc.arch=${basedir}/arch.xml
48
spec.version.base=1.27.0
48
spec.version.base=1.28.0
49
49
50
test.config.stableBTD.includes=**/*Test.class
50
test.config.stableBTD.includes=**/*Test.class
(-)a/editor.codetemplates/nbproject/project.xml (-1 / +1 lines)
Lines 144-150 Link Here
144
                    <compile-dependency/>
144
                    <compile-dependency/>
145
                    <run-dependency>
145
                    <run-dependency>
146
                        <release-version>1</release-version>
146
                        <release-version>1</release-version>
147
                        <specification-version>1.6</specification-version>
147
                        <specification-version>1.28</specification-version>
148
                    </run-dependency>
148
                    </run-dependency>
149
                </dependency>
149
                </dependency>
150
                <dependency>
150
                <dependency>
(-)a/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/storage/ui/CodeTemplatesPanel.java (+2 lines)
Lines 74-79 Link Here
74
import org.netbeans.api.editor.EditorRegistry;
74
import org.netbeans.api.editor.EditorRegistry;
75
import org.netbeans.api.editor.mimelookup.MimeLookup;
75
import org.netbeans.api.editor.mimelookup.MimeLookup;
76
import org.netbeans.api.editor.mimelookup.MimePath;
76
import org.netbeans.api.editor.mimelookup.MimePath;
77
import org.netbeans.api.options.OptionsDisplayer;
77
import org.netbeans.editor.Acceptor;
78
import org.netbeans.editor.Acceptor;
78
import org.netbeans.lib.editor.codetemplates.AbbrevDetection;
79
import org.netbeans.lib.editor.codetemplates.AbbrevDetection;
79
import org.netbeans.lib.editor.codetemplates.storage.CodeTemplateSettingsImpl.OnExpandAction;
80
import org.netbeans.lib.editor.codetemplates.storage.CodeTemplateSettingsImpl.OnExpandAction;
Lines 93-98 Link Here
93
 *
94
 *
94
 * @author Jan Jancura
95
 * @author Jan Jancura
95
 */
96
 */
97
@OptionsPanelController.Keywords(keywords = {"code", "templates"}, location = OptionsDisplayer.EDITOR, index = 3)
96
public class CodeTemplatesPanel extends JPanel implements ActionListener, ListSelectionListener, KeyListener, DocumentListener {
98
public class CodeTemplatesPanel extends JPanel implements ActionListener, ListSelectionListener, KeyListener, DocumentListener {
97
    
99
    
98
    private static final Logger LOG = Logger.getLogger(CodeTemplatesPanel.class.getName());
100
    private static final Logger LOG = Logger.getLogger(CodeTemplatesPanel.class.getName());
(-)a/editor.macros/nbproject/project.properties (-1 / +1 lines)
Lines 1-5 Link Here
1
javac.compilerargs=-Xlint -Xlint:-serial
1
javac.compilerargs=-Xlint -Xlint:-serial
2
javac.source=1.6
2
javac.source=1.6
3
spec.version.base=1.18.0
3
spec.version.base=1.19.0
4
4
5
test.config.stableBTD.includes=**/*Test.class
5
test.config.stableBTD.includes=**/*Test.class
(-)a/editor.macros/nbproject/project.xml (-1 / +1 lines)
Lines 65-71 Link Here
65
                    <compile-dependency/>
65
                    <compile-dependency/>
66
                    <run-dependency>
66
                    <run-dependency>
67
                        <release-version>1</release-version>
67
                        <release-version>1</release-version>
68
                        <specification-version>1.6</specification-version>
68
                        <specification-version>1.28</specification-version>
69
                    </run-dependency>
69
                    </run-dependency>
70
                </dependency>
70
                </dependency>
71
                <dependency>
71
                <dependency>
(-)a/editor.macros/src/org/netbeans/modules/editor/macros/storage/ui/MacrosPanel.java (+3 lines)
Lines 67-76 Link Here
67
import javax.swing.event.TableModelEvent;
67
import javax.swing.event.TableModelEvent;
68
import javax.swing.event.TableModelListener;
68
import javax.swing.event.TableModelListener;
69
import org.netbeans.api.editor.mimelookup.MimePath;
69
import org.netbeans.api.editor.mimelookup.MimePath;
70
import org.netbeans.api.options.OptionsDisplayer;
70
import org.netbeans.core.options.keymap.api.KeyStrokeUtils;
71
import org.netbeans.core.options.keymap.api.KeyStrokeUtils;
71
import org.netbeans.core.options.keymap.api.ShortcutAction;
72
import org.netbeans.core.options.keymap.api.ShortcutAction;
72
import org.netbeans.core.options.keymap.api.ShortcutsFinder;
73
import org.netbeans.core.options.keymap.api.ShortcutsFinder;
73
import org.netbeans.modules.editor.macros.storage.ui.MacrosModel.Macro;
74
import org.netbeans.modules.editor.macros.storage.ui.MacrosModel.Macro;
75
import org.netbeans.spi.options.OptionsPanelController;
74
import org.openide.DialogDescriptor;
76
import org.openide.DialogDescriptor;
75
import org.openide.DialogDisplayer;
77
import org.openide.DialogDisplayer;
76
import org.openide.awt.Mnemonics;
78
import org.openide.awt.Mnemonics;
Lines 82-87 Link Here
82
 *
84
 *
83
 * @author Jan Jancura
85
 * @author Jan Jancura
84
 */
86
 */
87
@OptionsPanelController.Keywords(keywords = {"macros"}, location = OptionsDisplayer.EDITOR, index = 6)
85
public class MacrosPanel extends JPanel {
88
public class MacrosPanel extends JPanel {
86
89
87
    private final MacrosModel model = MacrosModel.get();
90
    private final MacrosModel model = MacrosModel.get();
(-)a/form/nbproject/project.properties (-1 / +1 lines)
Lines 43-49 Link Here
43
extra.module.files=modules/ext/AbsoluteLayout.jar
43
extra.module.files=modules/ext/AbsoluteLayout.jar
44
javac.source=1.6
44
javac.source=1.6
45
javadoc.arch=${basedir}/arch.xml
45
javadoc.arch=${basedir}/arch.xml
46
spec.version.base=1.42.0
46
spec.version.base=1.43.0
47
test-unit-sys-prop.org.netbeans.modules.form.layoutdesign.test=0
47
test-unit-sys-prop.org.netbeans.modules.form.layoutdesign.test=0
48
jnlp.verify.excludes=sources/org/netbeans/lib/awtextra/AbsoluteLayout.java,sources/org/netbeans/lib/awtextra/AbsoluteConstraints.java,sources/readme.txt
48
jnlp.verify.excludes=sources/org/netbeans/lib/awtextra/AbsoluteLayout.java,sources/org/netbeans/lib/awtextra/AbsoluteConstraints.java,sources/readme.txt
49
49
(-)a/form/nbproject/project.xml (-1 / +1 lines)
Lines 90-96 Link Here
90
                    <compile-dependency/>
90
                    <compile-dependency/>
91
                    <run-dependency>
91
                    <run-dependency>
92
                        <release-version>1</release-version>
92
                        <release-version>1</release-version>
93
                        <specification-version>1.3</specification-version>
93
                        <specification-version>1.28</specification-version>
94
                    </run-dependency>
94
                    </run-dependency>
95
                </dependency>
95
                </dependency>
96
                <dependency>
96
                <dependency>
(-)a/form/src/org/netbeans/modules/form/FormEditorCustomizer.java (+2 lines)
Lines 59-64 Link Here
59
import javax.swing.*;
59
import javax.swing.*;
60
import javax.swing.event.ChangeEvent;
60
import javax.swing.event.ChangeEvent;
61
import javax.swing.event.ChangeListener;
61
import javax.swing.event.ChangeListener;
62
import org.netbeans.spi.options.OptionsPanelController;
62
import org.openide.awt.Mnemonics;
63
import org.openide.awt.Mnemonics;
63
import org.openide.explorer.propertysheet.PropertyPanel;
64
import org.openide.explorer.propertysheet.PropertyPanel;
64
import org.openide.nodes.PropertySupport;
65
import org.openide.nodes.PropertySupport;
Lines 70-75 Link Here
70
 *
71
 *
71
 * @author Jan Stola, Jan Jancura
72
 * @author Jan Stola, Jan Jancura
72
 */
73
 */
74
@OptionsPanelController.Keywords(keywords={"gui builder"}, location="Java", index=1)
73
public final class FormEditorCustomizer extends JPanel implements  ActionListener, ChangeListener {
75
public final class FormEditorCustomizer extends JPanel implements  ActionListener, ChangeListener {
74
    private JCheckBox cbFold = new JCheckBox ();
76
    private JCheckBox cbFold = new JCheckBox ();
75
    private JCheckBox cbAssistant = new JCheckBox();
77
    private JCheckBox cbAssistant = new JCheckBox();
(-)a/groovy.support/manifest.mf (-1 / +1 lines)
Lines 3-7 Link Here
3
OpenIDE-Module: org.netbeans.modules.groovy.support
3
OpenIDE-Module: org.netbeans.modules.groovy.support
4
OpenIDE-Module-Layer: org/netbeans/modules/groovy/support/resources/layer.xml
4
OpenIDE-Module-Layer: org/netbeans/modules/groovy/support/resources/layer.xml
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/support/resources/Bundle.properties
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/support/resources/Bundle.properties
6
OpenIDE-Module-Specification-Version: 1.22
6
OpenIDE-Module-Specification-Version: 1.23
7
OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
7
OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
(-)a/groovy.support/nbproject/project.xml (-1 / +1 lines)
Lines 127-133 Link Here
127
                    <compile-dependency/>
127
                    <compile-dependency/>
128
                    <run-dependency>
128
                    <run-dependency>
129
                        <release-version>1</release-version>
129
                        <release-version>1</release-version>
130
                        <specification-version>1.5</specification-version>
130
                        <specification-version>1.28</specification-version>
131
                    </run-dependency>
131
                    </run-dependency>
132
                </dependency>
132
                </dependency>
133
                <dependency>
133
                <dependency>
(-)a/groovy.support/src/org/netbeans/modules/groovy/support/options/SupportPanel.java (+3 lines)
Lines 56-63 Link Here
56
import javax.swing.JLabel;
56
import javax.swing.JLabel;
57
import javax.swing.SwingUtilities;
57
import javax.swing.SwingUtilities;
58
import org.netbeans.api.annotations.common.NonNull;
58
import org.netbeans.api.annotations.common.NonNull;
59
import org.netbeans.api.options.OptionsDisplayer;
59
import org.netbeans.modules.groovy.support.api.GroovySettings;
60
import org.netbeans.modules.groovy.support.api.GroovySettings;
60
import org.netbeans.modules.groovy.support.spi.GroovyOptionsSubpanel;
61
import org.netbeans.modules.groovy.support.spi.GroovyOptionsSubpanel;
62
import org.netbeans.spi.options.OptionsPanelController;
61
import org.openide.DialogDisplayer;
63
import org.openide.DialogDisplayer;
62
import org.openide.NotifyDescriptor;
64
import org.openide.NotifyDescriptor;
63
import org.openide.awt.HtmlBrowser;
65
import org.openide.awt.HtmlBrowser;
Lines 69-74 Link Here
69
 *
71
 *
70
 * @author Martin Adamek
72
 * @author Martin Adamek
71
 */
73
 */
74
@OptionsPanelController.Keywords(keywords={"groovy", "grails"}, location=OptionsDisplayer.ADVANCED, tabTitle="Groovy")
72
final class SupportPanel extends javax.swing.JPanel {
75
final class SupportPanel extends javax.swing.JPanel {
73
76
74
    private final Collection<GroovyOptionsSubpanel> subpanels;
77
    private final Collection<GroovyOptionsSubpanel> subpanels;
(-)a/javacard.project/manifest.mf (-1 / +1 lines)
Lines 4-9 Link Here
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javacard/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javacard/Bundle.properties
5
OpenIDE-Module-Requires: org.openide.windows.IOProvider
5
OpenIDE-Module-Requires: org.openide.windows.IOProvider
6
OpenIDE-Module-Provides: org.netbeans.modules.javacard.JavacardPlatform
6
OpenIDE-Module-Provides: org.netbeans.modules.javacard.JavacardPlatform
7
OpenIDE-Module-Specification-Version: 1.42
7
OpenIDE-Module-Specification-Version: 1.43
8
AutoUpdate-Show-In-Client: false
8
AutoUpdate-Show-In-Client: false
9
9
(-)a/javacard.project/nbproject/project.xml (-1 / +1 lines)
Lines 133-139 Link Here
133
                    <compile-dependency/>
133
                    <compile-dependency/>
134
                    <run-dependency>
134
                    <run-dependency>
135
                        <release-version>1</release-version>
135
                        <release-version>1</release-version>
136
                        <specification-version>1.11</specification-version>
136
                        <specification-version>1.28</specification-version>
137
                    </run-dependency>
137
                    </run-dependency>
138
                </dependency>
138
                </dependency>
139
                <dependency>
139
                <dependency>
(-)a/javacard.project/src/org/netbeans/modules/javacard/options/JavacardOptions.java (+3 lines)
Lines 49-54 Link Here
49
import javax.swing.text.Document;
49
import javax.swing.text.Document;
50
import org.netbeans.modules.javacard.common.GuiUtils;
50
import org.netbeans.modules.javacard.common.GuiUtils;
51
import org.netbeans.modules.javacard.common.Utils;
51
import org.netbeans.modules.javacard.common.Utils;
52
import org.netbeans.modules.options.java.api.JavaOptions;
53
import org.netbeans.spi.options.OptionsPanelController;
52
import org.netbeans.validation.api.Problem;
54
import org.netbeans.validation.api.Problem;
53
import org.netbeans.validation.api.Validator;
55
import org.netbeans.validation.api.Validator;
54
import org.netbeans.validation.api.builtin.stringvalidation.StringValidators;
56
import org.netbeans.validation.api.builtin.stringvalidation.StringValidators;
Lines 57-62 Link Here
57
import org.netbeans.validation.api.ui.swing.SwingValidationGroup;
59
import org.netbeans.validation.api.ui.swing.SwingValidationGroup;
58
import org.openide.util.NbBundle;
60
import org.openide.util.NbBundle;
59
61
62
@OptionsPanelController.Keywords(keywords={"java card"}, location=JavaOptions.JAVA, index=2)
60
final class JavacardOptions extends javax.swing.JPanel implements ValidationUI, DocumentListener {
63
final class JavacardOptions extends javax.swing.JPanel implements ValidationUI, DocumentListener {
61
64
62
    private final JavacardOptionsPanelController controller;
65
    private final JavacardOptionsPanelController controller;
(-)a/javafx2.scenebuilder/manifest.mf (-1 / +1 lines)
Lines 2-5 Link Here
2
AutoUpdate-Show-In-Client: true
2
AutoUpdate-Show-In-Client: true
3
OpenIDE-Module: org.netbeans.modules.javafx2.scenebuilder
3
OpenIDE-Module: org.netbeans.modules.javafx2.scenebuilder
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javafx2/scenebuilder/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javafx2/scenebuilder/Bundle.properties
5
OpenIDE-Module-Specification-Version: 1.4
5
OpenIDE-Module-Specification-Version: 1.5
(-)a/javafx2.scenebuilder/nbproject/project.xml (-1 / +1 lines)
Lines 19-25 Link Here
19
                    <compile-dependency/>
19
                    <compile-dependency/>
20
                    <run-dependency>
20
                    <run-dependency>
21
                        <release-version>1</release-version>
21
                        <release-version>1</release-version>
22
                        <specification-version>1.25</specification-version>
22
                        <specification-version>1.28</specification-version>
23
                    </run-dependency>
23
                    </run-dependency>
24
                </dependency>
24
                </dependency>
25
                <dependency>
25
                <dependency>
(-)a/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/options/SBOptionsPanel.java (+3 lines)
Lines 49-58 Link Here
49
import javax.swing.JFileChooser;
49
import javax.swing.JFileChooser;
50
import org.netbeans.modules.javafx2.scenebuilder.Home;
50
import org.netbeans.modules.javafx2.scenebuilder.Home;
51
import org.netbeans.modules.javafx2.scenebuilder.impl.SBHomeFactory;
51
import org.netbeans.modules.javafx2.scenebuilder.impl.SBHomeFactory;
52
import org.netbeans.modules.options.java.api.JavaOptions;
53
import org.netbeans.spi.options.OptionsPanelController;
52
import org.openide.DialogDisplayer;
54
import org.openide.DialogDisplayer;
53
import org.openide.NotifyDescriptor;
55
import org.openide.NotifyDescriptor;
54
import org.openide.util.NbBundle;
56
import org.openide.util.NbBundle;
55
57
58
@OptionsPanelController.Keywords(keywords={"javafx"}, location=JavaOptions.JAVA, index=7)
56
final class SBOptionsPanel extends javax.swing.JPanel {    
59
final class SBOptionsPanel extends javax.swing.JPanel {    
57
    private final SBOptionsPanelController controller;
60
    private final SBOptionsPanelController controller;
58
    
61
    
(-)a/javascript.editing/manifest.mf (-1 / +1 lines)
Lines 3-8 Link Here
3
OpenIDE-Module-Install: org/netbeans/modules/javascript/editing/Installer.class
3
OpenIDE-Module-Install: org/netbeans/modules/javascript/editing/Installer.class
4
OpenIDE-Module-Layer: org/netbeans/modules/javascript/editing/layer.xml
4
OpenIDE-Module-Layer: org/netbeans/modules/javascript/editing/layer.xml
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript/editing/Bundle.properties
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript/editing/Bundle.properties
6
OpenIDE-Module-Specification-Version: 0.108
6
OpenIDE-Module-Specification-Version: 0.109
7
AutoUpdate-Show-In-Client: false
7
AutoUpdate-Show-In-Client: false
8
8
(-)a/javascript.editing/nbproject/project.xml (-1 / +1 lines)
Lines 164-170 Link Here
164
                    <compile-dependency/>
164
                    <compile-dependency/>
165
                    <run-dependency>
165
                    <run-dependency>
166
                        <release-version>1</release-version>
166
                        <release-version>1</release-version>
167
                        <specification-version>1.5</specification-version>
167
                        <specification-version>1.28</specification-version>
168
                    </run-dependency>
168
                    </run-dependency>
169
                </dependency>
169
                </dependency>
170
                <dependency>
170
                <dependency>
(-)a/javascript.editing/src/org/netbeans/modules/javascript/editing/options/BrowserPanel.java (+3 lines)
Lines 46-60 Link Here
46
import javax.swing.ComboBoxModel;
46
import javax.swing.ComboBoxModel;
47
import javax.swing.DefaultComboBoxModel;
47
import javax.swing.DefaultComboBoxModel;
48
import org.mozilla.nb.javascript.Context;
48
import org.mozilla.nb.javascript.Context;
49
import org.netbeans.api.options.OptionsDisplayer;
49
import org.netbeans.modules.javascript.editing.BrowserVersion;
50
import org.netbeans.modules.javascript.editing.BrowserVersion;
50
import org.netbeans.modules.javascript.editing.SupportedBrowsers;
51
import org.netbeans.modules.javascript.editing.SupportedBrowsers;
51
import org.netbeans.modules.javascript.editing.spi.JSPreferencesPanel;
52
import org.netbeans.modules.javascript.editing.spi.JSPreferencesPanel;
53
import org.netbeans.spi.options.OptionsPanelController;
52
import org.openide.util.NbBundle;
54
import org.openide.util.NbBundle;
53
55
54
/**
56
/**
55
 *
57
 *
56
 * @author  Tor Norbye
58
 * @author  Tor Norbye
57
 */
59
 */
60
@OptionsPanelController.Keywords(keywords={"javascript"}, location=OptionsDisplayer.ADVANCED, tabTitle="#JsOptions.displayName")
58
public class BrowserPanel extends JSPreferencesPanel {
61
public class BrowserPanel extends JSPreferencesPanel {
59
62
60
63
(-)a/maven/manifest.mf (-1 / +1 lines)
Lines 1-6 Link Here
1
Manifest-Version: 1.0
1
Manifest-Version: 1.0
2
OpenIDE-Module: org.netbeans.modules.maven/2
2
OpenIDE-Module: org.netbeans.modules.maven/2
3
OpenIDE-Module-Specification-Version: 2.57
3
OpenIDE-Module-Specification-Version: 2.58
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/Bundle.properties
5
OpenIDE-Module-Layer: org/netbeans/modules/maven/layer.xml
5
OpenIDE-Module-Layer: org/netbeans/modules/maven/layer.xml
6
AutoUpdate-Show-In-Client: false
6
AutoUpdate-Show-In-Client: false
(-)a/maven/nbproject/project.xml (-1 / +1 lines)
Lines 197-203 Link Here
197
                    <compile-dependency/>
197
                    <compile-dependency/>
198
                    <run-dependency>
198
                    <run-dependency>
199
                        <release-version>1</release-version>
199
                        <release-version>1</release-version>
200
                        <specification-version>1.8</specification-version>
200
                        <specification-version>1.28</specification-version>
201
                    </run-dependency>
201
                    </run-dependency>
202
                </dependency>
202
                </dependency>
203
                <dependency>
203
                <dependency>
(-)a/maven/src/org/netbeans/modules/maven/options/GlobalOptionsPanel.java (+3 lines)
Lines 46-56 Link Here
46
import javax.swing.DefaultListModel;
46
import javax.swing.DefaultListModel;
47
import javax.swing.event.ListSelectionEvent;
47
import javax.swing.event.ListSelectionEvent;
48
import javax.swing.event.ListSelectionListener;
48
import javax.swing.event.ListSelectionListener;
49
import org.netbeans.modules.options.java.api.JavaOptions;
50
import org.netbeans.spi.options.OptionsPanelController;
49
51
50
/**
52
/**
51
 *
53
 *
52
 * @author mkleint
54
 * @author mkleint
53
 */
55
 */
56
@OptionsPanelController.Keywords(keywords={"maven global"}, location=JavaOptions.JAVA, index=5)
54
public class GlobalOptionsPanel extends javax.swing.JPanel {
57
public class GlobalOptionsPanel extends javax.swing.JPanel {
55
    private HashMap<String, String> descMap;
58
    private HashMap<String, String> descMap;
56
59
(-)a/maven/src/org/netbeans/modules/maven/options/SettingsPanel.java (+3 lines)
Lines 78-83 Link Here
78
import org.openide.util.NbBundle;
78
import org.openide.util.NbBundle;
79
import org.openide.util.RequestProcessor;
79
import org.openide.util.RequestProcessor;
80
import static org.netbeans.modules.maven.options.Bundle.*;
80
import static org.netbeans.modules.maven.options.Bundle.*;
81
import org.netbeans.modules.options.java.api.JavaOptions;
82
import org.netbeans.spi.options.OptionsPanelController;
81
import org.openide.util.NbBundle.Messages;
83
import org.openide.util.NbBundle.Messages;
82
84
83
/**
85
/**
Lines 85-90 Link Here
85
 * are written to the settings file, some into the Netbeans settings..
87
 * are written to the settings file, some into the Netbeans settings..
86
 * @author  mkleint
88
 * @author  mkleint
87
 */
89
 */
90
@OptionsPanelController.Keywords(keywords={"maven"}, location=JavaOptions.JAVA, index=5)
88
public class SettingsPanel extends javax.swing.JPanel {
91
public class SettingsPanel extends javax.swing.JPanel {
89
    private static final String SEPARATOR = "SEPARATOR";
92
    private static final String SEPARATOR = "SEPARATOR";
90
    private static final String BUNDLED_RUNTIME_VERSION =
93
    private static final String BUNDLED_RUNTIME_VERSION =
(-)a/mobility.svgcore/manifest.mf (-1 / +1 lines)
Lines 2-6 Link Here
2
OpenIDE-Module: org.netbeans.modules.mobility.svgcore
2
OpenIDE-Module: org.netbeans.modules.mobility.svgcore
3
OpenIDE-Module-Layer: org/netbeans/modules/mobility/svgcore/resources/layer.xml
3
OpenIDE-Module-Layer: org/netbeans/modules/mobility/svgcore/resources/layer.xml
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/mobility/svgcore/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/mobility/svgcore/Bundle.properties
5
OpenIDE-Module-Specification-Version: 1.18
5
OpenIDE-Module-Specification-Version: 1.19
6
AutoUpdate-Show-In-Client: false
6
AutoUpdate-Show-In-Client: false
(-)a/mobility.svgcore/nbproject/project.xml (-1 / +1 lines)
Lines 99-105 Link Here
99
                    <compile-dependency/>
99
                    <compile-dependency/>
100
                    <run-dependency>
100
                    <run-dependency>
101
                        <release-version>1</release-version>
101
                        <release-version>1</release-version>
102
                        <specification-version>1.4</specification-version>
102
                        <specification-version>1.28</specification-version>
103
                    </run-dependency>
103
                    </run-dependency>
104
                </dependency>
104
                </dependency>
105
                <dependency>
105
                <dependency>
(-)a/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/options/SvgcorePanel.java (+3 lines)
Lines 49-60 Link Here
49
import javax.swing.DefaultComboBoxModel;
49
import javax.swing.DefaultComboBoxModel;
50
import javax.swing.JFileChooser;
50
import javax.swing.JFileChooser;
51
import javax.swing.SwingUtilities;
51
import javax.swing.SwingUtilities;
52
import org.netbeans.api.options.OptionsDisplayer;
52
import org.netbeans.modules.mobility.svgcore.api.snippets.SVGSnippetsProvider;
53
import org.netbeans.modules.mobility.svgcore.api.snippets.SVGSnippetsProvider;
54
import org.netbeans.spi.options.OptionsPanelController;
53
import org.openide.DialogDisplayer;
55
import org.openide.DialogDisplayer;
54
import org.openide.NotifyDescriptor;
56
import org.openide.NotifyDescriptor;
55
import org.openide.util.Lookup;
57
import org.openide.util.Lookup;
56
import org.openide.util.NbBundle;
58
import org.openide.util.NbBundle;
57
59
60
@OptionsPanelController.Keywords(keywords={"#AdvancedOption_Tooltip", "svg"}, location=OptionsDisplayer.ADVANCED, tabTitle="#AdvancedOption_DisplayName")
58
final class SvgcorePanel extends javax.swing.JPanel {
61
final class SvgcorePanel extends javax.swing.JPanel {
59
62
60
    private final SvgcoreOptionsPanelController controller;
63
    private final SvgcoreOptionsPanelController controller;
(-)a/o.apache.tools.ant.module/nbproject/project.properties (-1 / +1 lines)
Lines 42-48 Link Here
42
42
43
javac.compilerargs=-Xlint:unchecked
43
javac.compilerargs=-Xlint:unchecked
44
javac.source=1.6
44
javac.source=1.6
45
spec.version.base=3.58.0
45
spec.version.base=3.59.0
46
compile.ant.jar=${ant.core.lib}
46
compile.ant.jar=${ant.core.lib}
47
src-bridge.cp.extra=build/classes:${compile.ant.jar}
47
src-bridge.cp.extra=build/classes:${compile.ant.jar}
48
extra.module.files=\
48
extra.module.files=\
(-)a/o.apache.tools.ant.module/nbproject/project.xml (-1 / +1 lines)
Lines 82-88 Link Here
82
                    <compile-dependency/>
82
                    <compile-dependency/>
83
                    <run-dependency>
83
                    <run-dependency>
84
                        <release-version>1</release-version>
84
                        <release-version>1</release-version>
85
                        <specification-version>1.8</specification-version>
85
                        <specification-version>1.28</specification-version>
86
                    </run-dependency>
86
                    </run-dependency>
87
                </dependency>
87
                </dependency>
88
                <dependency>
88
                <dependency>
(-)a/o.apache.tools.ant.module/src/org/apache/tools/ant/module/AntCustomizer.java (+3 lines)
Lines 59-64 Link Here
59
import javax.swing.JFileChooser;
59
import javax.swing.JFileChooser;
60
import javax.swing.JPanel;
60
import javax.swing.JPanel;
61
import javax.swing.SwingUtilities;
61
import javax.swing.SwingUtilities;
62
import org.netbeans.modules.options.java.api.JavaOptions;
63
import org.netbeans.spi.options.OptionsPanelController;
62
import org.openide.DialogDisplayer;
64
import org.openide.DialogDisplayer;
63
import org.openide.NotifyDescriptor;
65
import org.openide.NotifyDescriptor;
64
import org.openide.execution.NbClassPath;
66
import org.openide.execution.NbClassPath;
Lines 73-78 Link Here
73
 * Implementation of one panel in Options Dialog.
75
 * Implementation of one panel in Options Dialog.
74
 * @author Jan Jancura, Jesse Glick
76
 * @author Jan Jancura, Jesse Glick
75
 */
77
 */
78
@OptionsPanelController.Keywords(keywords={"ant"}, location=JavaOptions.JAVA, index=0)
76
public class AntCustomizer extends JPanel implements ActionListener {
79
public class AntCustomizer extends JPanel implements ActionListener {
77
    
80
    
78
    private List<File> classpath = Collections.emptyList();
81
    private List<File> classpath = Collections.emptyList();
(-)a/options.editor/manifest.mf (-1 / +1 lines)
Lines 2-7 Link Here
2
OpenIDE-Module: org.netbeans.modules.options.editor/1
2
OpenIDE-Module: org.netbeans.modules.options.editor/1
3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/options/editor/Bundle.properties
3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/options/editor/Bundle.properties
4
OpenIDE-Module-Layer: org/netbeans/modules/options/editor/mf-layer.xml
4
OpenIDE-Module-Layer: org/netbeans/modules/options/editor/mf-layer.xml
5
OpenIDE-Module-Specification-Version: 1.34
5
OpenIDE-Module-Specification-Version: 1.35
6
AutoUpdate-Show-In-Client: false
6
AutoUpdate-Show-In-Client: false
7
7
(-)a/options.editor/nbproject/project.xml (-1 / +1 lines)
Lines 136-142 Link Here
136
                    <compile-dependency/>
136
                    <compile-dependency/>
137
                    <run-dependency>
137
                    <run-dependency>
138
                        <release-version>1</release-version>
138
                        <release-version>1</release-version>
139
                        <specification-version>1.3</specification-version>
139
                        <specification-version>1.28</specification-version>
140
                    </run-dependency>
140
                    </run-dependency>
141
                </dependency>
141
                </dependency>
142
                <dependency>
142
                <dependency>
(-)a/options.editor/src/org/netbeans/modules/options/colors/AnnotationsPanel.java (+3 lines)
Lines 71-77 Link Here
71
import javax.swing.text.SimpleAttributeSet;
71
import javax.swing.text.SimpleAttributeSet;
72
import javax.swing.text.StyleConstants;
72
import javax.swing.text.StyleConstants;
73
import org.netbeans.api.editor.settings.EditorStyleConstants;
73
import org.netbeans.api.editor.settings.EditorStyleConstants;
74
import org.netbeans.api.options.OptionsDisplayer;
74
import org.netbeans.modules.options.colors.spi.FontsColorsController;
75
import org.netbeans.modules.options.colors.spi.FontsColorsController;
76
import org.netbeans.spi.options.OptionsPanelController;
75
import org.openide.awt.ColorComboBox;
77
import org.openide.awt.ColorComboBox;
76
import org.openide.awt.Mnemonics;
78
import org.openide.awt.Mnemonics;
77
import org.openide.util.NbBundle;
79
import org.openide.util.NbBundle;
Lines 80-85 Link Here
80
 *
82
 *
81
 * @author  Jan Jancura
83
 * @author  Jan Jancura
82
 */
84
 */
85
@OptionsPanelController.Keywords(keywords = {"annotations"}, location = OptionsDisplayer.FONTSANDCOLORS, index = 2)
83
public class AnnotationsPanel extends JPanel implements ActionListener, 
86
public class AnnotationsPanel extends JPanel implements ActionListener, 
84
    ItemListener, FontsColorsController {
87
    ItemListener, FontsColorsController {
85
    
88
    
(-)a/options.editor/src/org/netbeans/modules/options/colors/FontAndColorsPanel.java (+3 lines)
Lines 57-62 Link Here
57
import javax.swing.JLabel;
57
import javax.swing.JLabel;
58
import javax.swing.JPanel;
58
import javax.swing.JPanel;
59
import javax.swing.border.EmptyBorder;
59
import javax.swing.border.EmptyBorder;
60
import org.netbeans.api.options.OptionsDisplayer;
61
import org.netbeans.spi.options.OptionsPanelController;
60
import org.openide.DialogDisplayer;
62
import org.openide.DialogDisplayer;
61
import org.openide.NotifyDescriptor;
63
import org.openide.NotifyDescriptor;
62
import org.openide.NotifyDescriptor.InputLine;
64
import org.openide.NotifyDescriptor.InputLine;
Lines 68-73 Link Here
68
 *
70
 *
69
 * @author  Jan Jancura
71
 * @author  Jan Jancura
70
 */
72
 */
73
@OptionsPanelController.Keywords(keywords = {"Fonts & Colors"}, location = OptionsDisplayer.FONTSANDCOLORS, index = 0)
71
public class FontAndColorsPanel extends JPanel implements ActionListener {
74
public class FontAndColorsPanel extends JPanel implements ActionListener {
72
    
75
    
73
    private final Collection<? extends FontsColorsController> panels;
76
    private final Collection<? extends FontsColorsController> panels;
(-)a/options.editor/src/org/netbeans/modules/options/colors/HighlightingPanel.java (+3 lines)
Lines 70-76 Link Here
70
import javax.swing.text.AttributeSet;
70
import javax.swing.text.AttributeSet;
71
import javax.swing.text.SimpleAttributeSet;
71
import javax.swing.text.SimpleAttributeSet;
72
import javax.swing.text.StyleConstants;
72
import javax.swing.text.StyleConstants;
73
import org.netbeans.api.options.OptionsDisplayer;
73
import org.netbeans.modules.options.colors.spi.FontsColorsController;
74
import org.netbeans.modules.options.colors.spi.FontsColorsController;
75
import org.netbeans.spi.options.OptionsPanelController;
74
import org.openide.awt.ColorComboBox;
76
import org.openide.awt.ColorComboBox;
75
import org.openide.awt.Mnemonics;
77
import org.openide.awt.Mnemonics;
76
import org.openide.util.NbBundle;
78
import org.openide.util.NbBundle;
Lines 79-84 Link Here
79
 *
81
 *
80
 * @author  Jan Jancura
82
 * @author  Jan Jancura
81
 */
83
 */
84
@OptionsPanelController.Keywords(keywords={"highlighting"}, location=OptionsDisplayer.FONTSANDCOLORS, index=1)
82
public class HighlightingPanel extends JPanel implements ActionListener, ItemListener, FontsColorsController {
85
public class HighlightingPanel extends JPanel implements ActionListener, ItemListener, FontsColorsController {
83
    
86
    
84
    private ColorModel          colorModel = null;
87
    private ColorModel          colorModel = null;
(-)a/options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.java (+3 lines)
Lines 83-90 Link Here
83
import org.netbeans.api.editor.settings.EditorStyleConstants;
83
import org.netbeans.api.editor.settings.EditorStyleConstants;
84
import org.netbeans.api.editor.settings.FontColorNames;
84
import org.netbeans.api.editor.settings.FontColorNames;
85
import org.netbeans.api.editor.settings.FontColorSettings;
85
import org.netbeans.api.editor.settings.FontColorSettings;
86
import org.netbeans.api.options.OptionsDisplayer;
86
import org.netbeans.modules.options.colors.ColorModel.Preview;
87
import org.netbeans.modules.options.colors.ColorModel.Preview;
87
import org.netbeans.modules.options.colors.spi.FontsColorsController;
88
import org.netbeans.modules.options.colors.spi.FontsColorsController;
89
import org.netbeans.spi.options.OptionsPanelController;
88
import org.openide.DialogDescriptor;
90
import org.openide.DialogDescriptor;
89
import org.openide.DialogDisplayer;
91
import org.openide.DialogDisplayer;
90
import org.openide.awt.ColorComboBox;
92
import org.openide.awt.ColorComboBox;
Lines 97-102 Link Here
97
 *
99
 *
98
 * @author  Jan Jancura
100
 * @author  Jan Jancura
99
 */
101
 */
102
@OptionsPanelController.Keywords(keywords={"syntax coloring"}, location=OptionsDisplayer.FONTSANDCOLORS, index=0)
100
public class SyntaxColoringPanel extends JPanel implements ActionListener, 
103
public class SyntaxColoringPanel extends JPanel implements ActionListener, 
101
    PropertyChangeListener, FontsColorsController, ItemListener {
104
    PropertyChangeListener, FontsColorsController, ItemListener {
102
    
105
    
(-)a/options.editor/src/org/netbeans/modules/options/editor/FolderBasedOptionPanel.java (+5 lines)
Lines 56-61 Link Here
56
import javax.swing.text.Document;
56
import javax.swing.text.Document;
57
import javax.swing.text.JTextComponent;
57
import javax.swing.text.JTextComponent;
58
import org.netbeans.api.editor.EditorRegistry;
58
import org.netbeans.api.editor.EditorRegistry;
59
import org.netbeans.api.options.OptionsDisplayer;
59
import org.netbeans.modules.editor.settings.storage.api.EditorSettings;
60
import org.netbeans.modules.editor.settings.storage.api.EditorSettings;
60
import org.netbeans.spi.options.OptionsPanelController;
61
import org.netbeans.spi.options.OptionsPanelController;
61
62
Lines 63-68 Link Here
63
 *
64
 *
64
 * @author Dusan Balek
65
 * @author Dusan Balek
65
 */
66
 */
67
@OptionsPanelController.KeywordsRegistration({
68
    @OptionsPanelController.Keywords(keywords = {"hints"}, location = OptionsDisplayer.EDITOR, index = 4),
69
    @OptionsPanelController.Keywords(keywords = {"highlighting"}, location = OptionsDisplayer.EDITOR, index = 5)
70
})
66
public final class FolderBasedOptionPanel extends JPanel implements ActionListener {
71
public final class FolderBasedOptionPanel extends JPanel implements ActionListener {
67
    
72
    
68
    private final FolderBasedController controller;
73
    private final FolderBasedController controller;
(-)a/options.editor/src/org/netbeans/modules/options/editor/completion/CodeCompletionOptionsPanel.java (+3 lines)
Lines 55-67 Link Here
55
import javax.swing.DefaultListCellRenderer;
55
import javax.swing.DefaultListCellRenderer;
56
import javax.swing.JList;
56
import javax.swing.JList;
57
import javax.swing.JPanel;
57
import javax.swing.JPanel;
58
import org.netbeans.api.options.OptionsDisplayer;
58
import org.netbeans.modules.editor.settings.storage.api.EditorSettings;
59
import org.netbeans.modules.editor.settings.storage.api.EditorSettings;
59
import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;
60
import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;
61
import org.netbeans.spi.options.OptionsPanelController;
60
import org.openide.util.WeakListeners;
62
import org.openide.util.WeakListeners;
61
63
62
/**
64
/**
63
 * @author Dusan Balek
65
 * @author Dusan Balek
64
 */
66
 */
67
@OptionsPanelController.Keywords(keywords = {"code completion"}, location = OptionsDisplayer.EDITOR, index = 2)
65
public class CodeCompletionOptionsPanel extends JPanel implements PropertyChangeListener {
68
public class CodeCompletionOptionsPanel extends JPanel implements PropertyChangeListener {
66
    
69
    
67
    private CodeCompletionOptionsSelector selector;
70
    private CodeCompletionOptionsSelector selector;
(-)a/options.editor/src/org/netbeans/modules/options/editor/completion/GeneralCompletionOptionsPanel.java (+3 lines)
Lines 47-57 Link Here
47
import java.util.prefs.Preferences;
47
import java.util.prefs.Preferences;
48
import javax.swing.JPanel;
48
import javax.swing.JPanel;
49
import org.netbeans.api.editor.settings.SimpleValueNames;
49
import org.netbeans.api.editor.settings.SimpleValueNames;
50
import org.netbeans.api.options.OptionsDisplayer;
51
import org.netbeans.spi.options.OptionsPanelController;
50
52
51
/**
53
/**
52
 *
54
 *
53
 * @author Dusan Balek
55
 * @author Dusan Balek
54
 */
56
 */
57
@OptionsPanelController.Keywords(keywords = {"all languages"}, location = OptionsDisplayer.EDITOR, index = 2)
55
public class GeneralCompletionOptionsPanel extends JPanel {
58
public class GeneralCompletionOptionsPanel extends JPanel {
56
59
57
    private Preferences preferences;
60
    private Preferences preferences;
(-)a/options.editor/src/org/netbeans/modules/options/editor/onsave/OnSaveCommonPanel.java (+3 lines)
Lines 49-54 Link Here
49
import javax.swing.JList;
49
import javax.swing.JList;
50
import javax.swing.ListCellRenderer;
50
import javax.swing.ListCellRenderer;
51
import org.netbeans.api.editor.settings.SimpleValueNames;
51
import org.netbeans.api.editor.settings.SimpleValueNames;
52
import org.netbeans.api.options.OptionsDisplayer;
53
import org.netbeans.spi.options.OptionsPanelController;
52
import org.openide.awt.Mnemonics;
54
import org.openide.awt.Mnemonics;
53
import org.openide.util.NbBundle;
55
import org.openide.util.NbBundle;
54
56
Lines 57-62 Link Here
57
 *
59
 *
58
 * @author Miloslav Metelka
60
 * @author Miloslav Metelka
59
 */
61
 */
62
@OptionsPanelController.Keywords(keywords = {"all languages"}, location = OptionsDisplayer.EDITOR, index = 7)
60
public class OnSaveCommonPanel extends javax.swing.JPanel {
63
public class OnSaveCommonPanel extends javax.swing.JPanel {
61
    
64
    
62
    private static final String[] LINE_OPTIONS = new String[] { "never", "always", "modified-lines" }; // NOI18N
65
    private static final String[] LINE_OPTIONS = new String[] { "never", "always", "modified-lines" }; // NOI18N
(-)a/options.editor/src/org/netbeans/modules/options/editor/onsave/OnSaveTabPanel.java (+3 lines)
Lines 50-56 Link Here
50
import javax.swing.DefaultListCellRenderer;
50
import javax.swing.DefaultListCellRenderer;
51
import javax.swing.JList;
51
import javax.swing.JList;
52
import javax.swing.JPanel;
52
import javax.swing.JPanel;
53
import org.netbeans.api.options.OptionsDisplayer;
53
import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;
54
import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;
55
import org.netbeans.spi.options.OptionsPanelController;
54
import org.openide.util.WeakListeners;
56
import org.openide.util.WeakListeners;
55
57
56
/**
58
/**
Lines 58-63 Link Here
58
 *
60
 *
59
 * @author Miloslav Metelka
61
 * @author Miloslav Metelka
60
 */
62
 */
63
@OptionsPanelController.Keywords(keywords = {"on save"}, location = OptionsDisplayer.EDITOR, index = 7)
61
public class OnSaveTabPanel extends JPanel implements PropertyChangeListener {
64
public class OnSaveTabPanel extends JPanel implements PropertyChangeListener {
62
    
65
    
63
    private OnSaveCommonPanel commonPanel;
66
    private OnSaveCommonPanel commonPanel;
(-)a/options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.java (+4 lines)
Lines 53-58 Link Here
53
import javax.swing.JList;
53
import javax.swing.JList;
54
import javax.swing.JPanel;
54
import javax.swing.JPanel;
55
import javax.swing.ListCellRenderer;
55
import javax.swing.ListCellRenderer;
56
import org.netbeans.api.options.OptionsDisplayer;
57
import org.netbeans.spi.options.OptionsPanelController;
56
import org.openide.awt.Mnemonics;
58
import org.openide.awt.Mnemonics;
57
import org.openide.util.NbBundle;
59
import org.openide.util.NbBundle;
58
60
Lines 61-66 Link Here
61
 *
63
 *
62
 * @author Jan Jancura
64
 * @author Jan Jancura
63
 */
65
 */
66
@OptionsPanelController.Keywords(keywords={"#KW_General_Editor"}, location=OptionsDisplayer.EDITOR, index=0)
67
@NbBundle.Messages({"KW_General_Editor=general editor"})
64
public class GeneralEditorPanel extends JPanel implements ActionListener {
68
public class GeneralEditorPanel extends JPanel implements ActionListener {
65
69
66
    private boolean         changed = false;
70
    private boolean         changed = false;
(-)a/options.editor/src/org/netbeans/modules/options/indentation/FormattingPanel.java (+3 lines)
Lines 65-73 Link Here
65
import javax.swing.text.Document;
65
import javax.swing.text.Document;
66
import javax.swing.text.JTextComponent;
66
import javax.swing.text.JTextComponent;
67
import org.netbeans.api.editor.EditorRegistry;
67
import org.netbeans.api.editor.EditorRegistry;
68
import org.netbeans.api.options.OptionsDisplayer;
68
import org.netbeans.modules.editor.settings.storage.api.EditorSettings;
69
import org.netbeans.modules.editor.settings.storage.api.EditorSettings;
69
import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;
70
import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;
70
import org.netbeans.modules.options.editor.spi.PreviewProvider;
71
import org.netbeans.modules.options.editor.spi.PreviewProvider;
72
import org.netbeans.spi.options.OptionsPanelController;
71
import org.openide.util.NbBundle;
73
import org.openide.util.NbBundle;
72
import org.openide.util.WeakListeners;
74
import org.openide.util.WeakListeners;
73
75
Lines 75-80 Link Here
75
 *
77
 *
76
 * @author Dusan Balek
78
 * @author Dusan Balek
77
 */
79
 */
80
@OptionsPanelController.Keywords(keywords={"formatting"}, location=OptionsDisplayer.EDITOR, index=1)
78
public final class FormattingPanel extends JPanel implements PropertyChangeListener {
81
public final class FormattingPanel extends JPanel implements PropertyChangeListener {
79
    
82
    
80
    /** Creates new form FormattingPanel */
83
    /** Creates new form FormattingPanel */
(-)a/options.editor/src/org/netbeans/modules/options/indentation/IndentationPanel.java (+3 lines)
Lines 79-88 Link Here
79
import javax.swing.text.Document;
79
import javax.swing.text.Document;
80
import org.netbeans.api.editor.mimelookup.MimePath;
80
import org.netbeans.api.editor.mimelookup.MimePath;
81
import org.netbeans.api.editor.settings.SimpleValueNames;
81
import org.netbeans.api.editor.settings.SimpleValueNames;
82
import org.netbeans.api.options.OptionsDisplayer;
82
import org.netbeans.editor.BaseDocument;
83
import org.netbeans.editor.BaseDocument;
83
import org.netbeans.modules.editor.indent.api.IndentUtils;
84
import org.netbeans.modules.editor.indent.api.IndentUtils;
84
import org.netbeans.modules.editor.indent.api.Reformat;
85
import org.netbeans.modules.editor.indent.api.Reformat;
85
import org.netbeans.modules.options.editor.spi.PreviewProvider;
86
import org.netbeans.modules.options.editor.spi.PreviewProvider;
87
import org.netbeans.spi.options.OptionsPanelController;
86
import org.openide.awt.Mnemonics;
88
import org.openide.awt.Mnemonics;
87
import org.openide.filesystems.FileObject;
89
import org.openide.filesystems.FileObject;
88
import org.openide.text.CloneableEditorSupport;
90
import org.openide.text.CloneableEditorSupport;
Lines 96-101 Link Here
96
 *
98
 *
97
 * @author Jan Jancura
99
 * @author Jan Jancura
98
 */
100
 */
101
@OptionsPanelController.Keywords(keywords={"indentation"}, location=OptionsDisplayer.EDITOR, index=1)
99
public class IndentationPanel extends JPanel implements ChangeListener, ActionListener, PreferenceChangeListener {
102
public class IndentationPanel extends JPanel implements ChangeListener, ActionListener, PreferenceChangeListener {
100
103
101
    private static final Logger LOG = Logger.getLogger(IndentationPanel.class.getName());
104
    private static final Logger LOG = Logger.getLogger(IndentationPanel.class.getName());
(-)a/options.keymap/manifest.mf (-1 / +1 lines)
Lines 2-8 Link Here
2
OpenIDE-Module: org.netbeans.modules.options.keymap
2
OpenIDE-Module: org.netbeans.modules.options.keymap
3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/options/keymap/Bundle.properties
3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/options/keymap/Bundle.properties
4
OpenIDE-Module-Layer: org/netbeans/modules/options/keymap/mf-layer.xml
4
OpenIDE-Module-Layer: org/netbeans/modules/options/keymap/mf-layer.xml
5
OpenIDE-Module-Specification-Version: 1.21
5
OpenIDE-Module-Specification-Version: 1.22
6
AutoUpdate-Show-In-Client: false
6
AutoUpdate-Show-In-Client: false
7
AutoUpdate-Essential-Module: true
7
AutoUpdate-Essential-Module: true
8
8
(-)a/options.keymap/nbproject/project.xml (-1 / +1 lines)
Lines 64-70 Link Here
64
                    <compile-dependency/>
64
                    <compile-dependency/>
65
                    <run-dependency>
65
                    <run-dependency>
66
                        <release-version>1</release-version>
66
                        <release-version>1</release-version>
67
                        <specification-version>1.4</specification-version>
67
                        <specification-version>1.28</specification-version>
68
                    </run-dependency>
68
                    </run-dependency>
69
                </dependency>
69
                </dependency>
70
                <dependency>
70
                <dependency>
(-)a/options.keymap/src/org/netbeans/modules/options/keymap/KeymapPanel.java (+3 lines)
Lines 73-79 Link Here
73
import javax.swing.event.TableModelEvent;
73
import javax.swing.event.TableModelEvent;
74
import javax.swing.table.TableColumn;
74
import javax.swing.table.TableColumn;
75
import javax.swing.table.TableModel;
75
import javax.swing.table.TableModel;
76
import org.netbeans.api.options.OptionsDisplayer;
76
import org.netbeans.core.options.keymap.api.ShortcutAction;
77
import org.netbeans.core.options.keymap.api.ShortcutAction;
78
import org.netbeans.spi.options.OptionsPanelController;
77
import org.openide.DialogDescriptor;
79
import org.openide.DialogDescriptor;
78
import org.openide.DialogDisplayer;
80
import org.openide.DialogDisplayer;
79
import org.openide.util.NbBundle;
81
import org.openide.util.NbBundle;
Lines 83-88 Link Here
83
 *
85
 *
84
 * @author Max Sauer
86
 * @author Max Sauer
85
 */
87
 */
88
@OptionsPanelController.Keywords(keywords={"keymaps"}, location=OptionsDisplayer.KEYMAPS)
86
public class KeymapPanel extends javax.swing.JPanel implements ActionListener, Popupable {
89
public class KeymapPanel extends javax.swing.JPanel implements ActionListener, Popupable {
87
90
88
    // Delay times for incremental search [ms]
91
    // Delay times for incremental search [ms]
(-)a/profiler.options/manifest.mf (-1 / +1 lines)
Lines 3-7 Link Here
3
OpenIDE-Module: org.netbeans.modules.profiler.options
3
OpenIDE-Module: org.netbeans.modules.profiler.options
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/profiler/options/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/profiler/options/Bundle.properties
5
OpenIDE-Module-Recommends: org.netbeans.modules.options.java
5
OpenIDE-Module-Recommends: org.netbeans.modules.options.java
6
OpenIDE-Module-Specification-Version: 1.4
6
OpenIDE-Module-Specification-Version: 1.5
7
7
(-)a/profiler.options/nbproject/project.xml (-1 / +1 lines)
Lines 20-26 Link Here
20
                    <compile-dependency/>
20
                    <compile-dependency/>
21
                    <run-dependency>
21
                    <run-dependency>
22
                        <release-version>1</release-version>
22
                        <release-version>1</release-version>
23
                        <specification-version>1.22</specification-version>
23
                        <specification-version>1.28</specification-version>
24
                    </run-dependency>
24
                    </run-dependency>
25
                </dependency>
25
                </dependency>
26
                <dependency>
26
                <dependency>
(-)a/profiler.options/src/org/netbeans/modules/profiler/options/ui/ProfilerOptionsPanel.java (+3 lines)
Lines 54-60 Link Here
54
import java.util.ArrayList;
54
import java.util.ArrayList;
55
import java.util.Iterator;
55
import java.util.Iterator;
56
import javax.swing.*;
56
import javax.swing.*;
57
import org.netbeans.modules.options.java.api.JavaOptions;
57
import org.netbeans.modules.profiler.api.JavaPlatform;
58
import org.netbeans.modules.profiler.api.JavaPlatform;
59
import org.netbeans.spi.options.OptionsPanelController;
58
60
59
61
60
/**
62
/**
Lines 107-112 Link Here
107
    "ProfilerOptionsPanel_JavaPlatformComboAccessDescr=Java platform used for running the profiled application",
109
    "ProfilerOptionsPanel_JavaPlatformComboAccessDescr=Java platform used for running the profiled application",
108
    "ProfilerOptionsPanel_IfThreadsMonitoringEnabledHint=if threads monitoring is enabled"
110
    "ProfilerOptionsPanel_IfThreadsMonitoringEnabledHint=if threads monitoring is enabled"
109
})
111
})
112
@OptionsPanelController.Keywords(keywords={"profiler"}, location=JavaOptions.JAVA, index=6)
110
public final class ProfilerOptionsPanel extends JPanel implements ActionListener {
113
public final class ProfilerOptionsPanel extends JPanel implements ActionListener {
111
    //~ Inner Classes ------------------------------------------------------------------------------------------------------------
114
    //~ Inner Classes ------------------------------------------------------------------------------------------------------------
112
115
(-)a/spellchecker/nbproject/project.properties (-1 / +1 lines)
Lines 46-52 Link Here
46
license.file=../standard-nbm-license.txt
46
license.file=../standard-nbm-license.txt
47
nbm.homepage=http://spellchecker.netbeans.org
47
nbm.homepage=http://spellchecker.netbeans.org
48
nbm.module.author=Jan Lahoda
48
nbm.module.author=Jan Lahoda
49
spec.version.base=1.22.0
49
spec.version.base=1.23.0
50
50
51
test.config.stableBTD.includes=**/*Test.class
51
test.config.stableBTD.includes=**/*Test.class
52
test.config.stableBTD.excludes=\
52
test.config.stableBTD.excludes=\
(-)a/spellchecker/nbproject/project.xml (-1 / +1 lines)
Lines 83-89 Link Here
83
                    <compile-dependency/>
83
                    <compile-dependency/>
84
                    <run-dependency>
84
                    <run-dependency>
85
                        <release-version>1</release-version>
85
                        <release-version>1</release-version>
86
                        <specification-version>1.14</specification-version>
86
                        <specification-version>1.28</specification-version>
87
                    </run-dependency>
87
                    </run-dependency>
88
                </dependency>
88
                </dependency>
89
                <dependency>
89
                <dependency>
(-)a/spellchecker/src/org/netbeans/modules/spellchecker/options/DictionaryInstallerPanel.java (+3 lines)
Lines 62-68 Link Here
62
import javax.swing.JFileChooser;
62
import javax.swing.JFileChooser;
63
import javax.swing.event.DocumentEvent;
63
import javax.swing.event.DocumentEvent;
64
import javax.swing.event.DocumentListener;
64
import javax.swing.event.DocumentListener;
65
import org.netbeans.api.options.OptionsDisplayer;
65
import org.netbeans.modules.spellchecker.Utilities;
66
import org.netbeans.modules.spellchecker.Utilities;
67
import org.netbeans.spi.options.OptionsPanelController;
66
import org.openide.DialogDisplayer;
68
import org.openide.DialogDisplayer;
67
import org.openide.NotificationLineSupport;
69
import org.openide.NotificationLineSupport;
68
import org.openide.NotifyDescriptor;
70
import org.openide.NotifyDescriptor;
Lines 74-79 Link Here
74
/**
76
/**
75
 * @author David Kaspar
77
 * @author David Kaspar
76
 */
78
 */
79
@OptionsPanelController.Keywords(keywords = {"install", "dictionary"}, location = OptionsDisplayer.EDITOR, index = 8)
77
public class DictionaryInstallerPanel extends javax.swing.JPanel {
80
public class DictionaryInstallerPanel extends javax.swing.JPanel {
78
    private final JButton okButton;
81
    private final JButton okButton;
79
82
(-)a/spellchecker/src/org/netbeans/modules/spellchecker/options/SpellcheckerOptionsPanel.java (+3 lines)
Lines 82-92 Link Here
82
import javax.swing.text.JTextComponent;
82
import javax.swing.text.JTextComponent;
83
83
84
import org.netbeans.api.editor.EditorRegistry;
84
import org.netbeans.api.editor.EditorRegistry;
85
import org.netbeans.api.options.OptionsDisplayer;
85
import org.netbeans.modules.spellchecker.ComponentPeer;
86
import org.netbeans.modules.spellchecker.ComponentPeer;
86
import org.netbeans.modules.spellchecker.DefaultLocaleQueryImplementation;
87
import org.netbeans.modules.spellchecker.DefaultLocaleQueryImplementation;
87
import org.netbeans.modules.spellchecker.DictionaryProviderImpl;
88
import org.netbeans.modules.spellchecker.DictionaryProviderImpl;
88
import org.netbeans.modules.spellchecker.options.DictionaryInstallerPanel.DictionaryDescription;
89
import org.netbeans.modules.spellchecker.options.DictionaryInstallerPanel.DictionaryDescription;
89
import org.netbeans.modules.spellchecker.spi.dictionary.DictionaryProvider;
90
import org.netbeans.modules.spellchecker.spi.dictionary.DictionaryProvider;
91
import org.netbeans.spi.options.OptionsPanelController;
90
import org.openide.DialogDescriptor;
92
import org.openide.DialogDescriptor;
91
import org.openide.DialogDisplayer;
93
import org.openide.DialogDisplayer;
92
import org.openide.filesystems.FileObject;
94
import org.openide.filesystems.FileObject;
Lines 102-107 Link Here
102
 *
104
 *
103
 * @author Jan Lahoda
105
 * @author Jan Lahoda
104
 */
106
 */
107
@OptionsPanelController.Keywords(keywords = {"spellchecker"}, location = OptionsDisplayer.EDITOR, index = 8)
105
public class SpellcheckerOptionsPanel extends javax.swing.JPanel {
108
public class SpellcheckerOptionsPanel extends javax.swing.JPanel {
106
    
109
    
107
    private List<Locale> removedDictionaries = new ArrayList<Locale>();
110
    private List<Locale> removedDictionaries = new ArrayList<Locale>();
(-)a/tasklist.todo/nbproject/project.properties (-1 / +1 lines)
Lines 1-6 Link Here
1
javac.compilerargs=-Xlint:unchecked
1
javac.compilerargs=-Xlint:unchecked
2
javac.source=1.6
2
javac.source=1.6
3
spec.version.base=1.18.0
3
spec.version.base=1.19.0
4
#hook for apisupport TestBase 
4
#hook for apisupport TestBase 
5
test-unit-sys-prop.test.nbcvsroot=${nb_all}
5
test-unit-sys-prop.test.nbcvsroot=${nb_all}
6
test-unit-sys-prop.xtest.netbeans.dest.dir=${netbeans.dest.dir}
6
test-unit-sys-prop.xtest.netbeans.dest.dir=${netbeans.dest.dir}
(-)a/tasklist.todo/nbproject/project.xml (-1 / +1 lines)
Lines 11-17 Link Here
11
                    <compile-dependency/>
11
                    <compile-dependency/>
12
                    <run-dependency>
12
                    <run-dependency>
13
                        <release-version>1</release-version>
13
                        <release-version>1</release-version>
14
                        <specification-version>1.5</specification-version>
14
                        <specification-version>1.28</specification-version>
15
                    </run-dependency>
15
                    </run-dependency>
16
                </dependency>
16
                </dependency>
17
                <dependency>
17
                <dependency>
(-)a/tasklist.todo/src/org/netbeans/modules/tasklist/todo/settings/ToDoCustomizer.java (+2 lines)
Lines 57-62 Link Here
57
import javax.swing.table.DefaultTableModel;
57
import javax.swing.table.DefaultTableModel;
58
import javax.swing.table.TableCellEditor;
58
import javax.swing.table.TableCellEditor;
59
import javax.swing.text.JTextComponent;
59
import javax.swing.text.JTextComponent;
60
import org.netbeans.api.options.OptionsDisplayer;
60
import org.netbeans.spi.options.OptionsPanelController;
61
import org.netbeans.spi.options.OptionsPanelController;
61
import org.openide.util.NbBundle;
62
import org.openide.util.NbBundle;
62
63
Lines 64-69 Link Here
64
 *
65
 *
65
 * @author S. Aubrecht
66
 * @author S. Aubrecht
66
 */
67
 */
68
@OptionsPanelController.Keywords(keywords={"#KW_ToDo", "action", "items"}, location=OptionsDisplayer.ADVANCED, tabTitle="#LBL_Options")
67
class ToDoCustomizer extends javax.swing.JPanel {
69
class ToDoCustomizer extends javax.swing.JPanel {
68
    
70
    
69
    private boolean changed = false;
71
    private boolean changed = false;
(-)a/terminal/manifest.mf (-1 / +1 lines)
Lines 3-7 Link Here
3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/terminal/Bundle.properties
3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/terminal/Bundle.properties
4
OpenIDE-Module-Provides: org.openide.windows.IOProvider
4
OpenIDE-Module-Provides: org.openide.windows.IOProvider
5
OpenIDE-Module-Layer: org/netbeans/modules/terminal/layer.xml
5
OpenIDE-Module-Layer: org/netbeans/modules/terminal/layer.xml
6
OpenIDE-Module-Specification-Version: 1.10
6
OpenIDE-Module-Specification-Version: 1.11
7
7
(-)a/terminal/nbproject/project.xml (-1 / +1 lines)
Lines 37-43 Link Here
37
                    <compile-dependency/>
37
                    <compile-dependency/>
38
                    <run-dependency>
38
                    <run-dependency>
39
                        <release-version>1</release-version>
39
                        <release-version>1</release-version>
40
                        <specification-version>1.11</specification-version>
40
                        <specification-version>1.28</specification-version>
41
                    </run-dependency>
41
                    </run-dependency>
42
                </dependency>
42
                </dependency>
43
                <dependency>
43
                <dependency>
(-)a/terminal/src/org/netbeans/modules/terminal/TermAdvancedOption.java (+2 lines)
Lines 46-51 Link Here
46
import java.util.prefs.Preferences;
46
import java.util.prefs.Preferences;
47
import java.beans.PropertyChangeListener;
47
import java.beans.PropertyChangeListener;
48
import javax.swing.JComponent;
48
import javax.swing.JComponent;
49
import org.netbeans.api.options.OptionsDisplayer;
49
50
50
import org.openide.util.HelpCtx;
51
import org.openide.util.HelpCtx;
51
import org.openide.util.Lookup;
52
import org.openide.util.Lookup;
Lines 67-72 Link Here
67
keywordsCategory="Advanced/TermAdvancedOption"// NOI18N
68
keywordsCategory="Advanced/TermAdvancedOption"// NOI18N
68
//tooltip="#CTL_Term_options" // NOI18N
69
//tooltip="#CTL_Term_options" // NOI18N
69
)
70
)
71
@OptionsPanelController.Keywords(keywords={"terminal"}, location=OptionsDisplayer.ADVANCED, tabTitle="#CTL_Term_options")
70
public final class TermAdvancedOption extends OptionsPanelController {
72
public final class TermAdvancedOption extends OptionsPanelController {
71
    private TermOptions termOptions;
73
    private TermOptions termOptions;
72
    private TermOptions clonedTermOptions;
74
    private TermOptions clonedTermOptions;
(-)a/versioning.ui/nbproject/project.properties (-1 / +1 lines)
Lines 44-47 Link Here
44
javac.compilerargs=-Xlint:unchecked
44
javac.compilerargs=-Xlint:unchecked
45
javac.source=1.6
45
javac.source=1.6
46
46
47
spec.version.base=1.6.0
47
spec.version.base=1.7.0
(-)a/versioning.ui/nbproject/project.xml (-1 / +1 lines)
Lines 117-123 Link Here
117
                    <compile-dependency/>
117
                    <compile-dependency/>
118
                    <run-dependency>
118
                    <run-dependency>
119
                        <release-version>1</release-version>
119
                        <release-version>1</release-version>
120
                        <specification-version>1.23</specification-version>
120
                        <specification-version>1.28</specification-version>
121
                    </run-dependency>
121
                    </run-dependency>
122
                </dependency>
122
                </dependency>
123
                <dependency>
123
                <dependency>
(-)a/versioning.ui/src/org/netbeans/modules/versioning/ui/options/GeneralOptionsPanel.java (+3 lines)
Lines 54-67 Link Here
54
import javax.swing.DefaultListCellRenderer;
54
import javax.swing.DefaultListCellRenderer;
55
import javax.swing.DefaultListModel;
55
import javax.swing.DefaultListModel;
56
import javax.swing.JList;
56
import javax.swing.JList;
57
import org.netbeans.api.options.OptionsDisplayer;
57
import org.netbeans.modules.versioning.core.util.VCSSystemProvider.VersioningSystem;
58
import org.netbeans.modules.versioning.core.util.VCSSystemProvider.VersioningSystem;
58
import org.netbeans.modules.versioning.core.api.VCSFileProxy;
59
import org.netbeans.modules.versioning.core.api.VCSFileProxy;
59
import org.netbeans.modules.versioning.core.util.Utils;
60
import org.netbeans.modules.versioning.core.util.Utils;
61
import org.netbeans.spi.options.OptionsPanelController;
60
import org.openide.filesystems.FileChooserBuilder;
62
import org.openide.filesystems.FileChooserBuilder;
61
import org.openide.util.Lookup;
63
import org.openide.util.Lookup;
62
import org.openide.util.NbBundle;
64
import org.openide.util.NbBundle;
63
import org.openide.util.RequestProcessor;
65
import org.openide.util.RequestProcessor;
64
66
67
@OptionsPanelController.Keywords(keywords={"general", "versioning"}, location=OptionsDisplayer.ADVANCED, tabTitle="Versioning")
65
final class GeneralOptionsPanel extends javax.swing.JPanel implements ActionListener {
68
final class GeneralOptionsPanel extends javax.swing.JPanel implements ActionListener {
66
    
69
    
67
    private final GeneralOptionsPanelController controller;
70
    private final GeneralOptionsPanelController controller;
(-)a/versioning.ui/src/org/netbeans/modules/versioning/ui/options/HistoryOptionsPanel.java (+4 lines)
Lines 43-52 Link Here
43
 */
43
 */
44
package org.netbeans.modules.versioning.ui.options;
44
package org.netbeans.modules.versioning.ui.options;
45
45
46
import org.netbeans.api.options.OptionsDisplayer;
47
import org.netbeans.spi.options.OptionsPanelController;
48
46
/**
49
/**
47
 *
50
 *
48
 * @author Tomas Stupka
51
 * @author Tomas Stupka
49
 */
52
 */
53
@OptionsPanelController.Keywords(keywords={"history", "versioning"}, location=OptionsDisplayer.ADVANCED, tabTitle="Versioning")
50
public class HistoryOptionsPanel extends javax.swing.JPanel {
54
public class HistoryOptionsPanel extends javax.swing.JPanel {
51
    
55
    
52
    /** Creates new form SvnOptionsPanel */
56
    /** Creates new form SvnOptionsPanel */
(-)a/versioning.util/nbproject/project.properties (-1 / +1 lines)
Lines 44-50 Link Here
44
javac.source=1.6
44
javac.source=1.6
45
45
46
javadoc.name=Versioning Support Utilities
46
javadoc.name=Versioning Support Utilities
47
spec.version.base=1.28.0
47
spec.version.base=1.29.0
48
is.autoload=true
48
is.autoload=true
49
49
50
# Fatal error: Fatal error: class javax.net.SocketFactory not found
50
# Fatal error: Fatal error: class javax.net.SocketFactory not found
(-)a/versioning.util/nbproject/project.xml (-1 / +1 lines)
Lines 108-114 Link Here
108
                    <compile-dependency/>
108
                    <compile-dependency/>
109
                    <run-dependency>
109
                    <run-dependency>
110
                        <release-version>1</release-version>
110
                        <release-version>1</release-version>
111
                        <specification-version>1.4</specification-version>
111
                        <specification-version>1.28</specification-version>
112
                    </run-dependency>
112
                    </run-dependency>
113
                </dependency>
113
                </dependency>
114
                <dependency>
114
                <dependency>
(-)a/versioning.util/src/org/netbeans/modules/versioning/util/VcsAdvancedOptionsPanel.java (+3 lines)
Lines 46-56 Link Here
46
import java.util.HashMap;
46
import java.util.HashMap;
47
import javax.swing.DefaultListModel;
47
import javax.swing.DefaultListModel;
48
import javax.swing.JComponent;
48
import javax.swing.JComponent;
49
import org.netbeans.api.options.OptionsDisplayer;
50
import org.netbeans.spi.options.OptionsPanelController;
49
51
50
/**
52
/**
51
 *
53
 *
52
 * @author  pbuzek
54
 * @author  pbuzek
53
 */
55
 */
56
@OptionsPanelController.Keywords(keywords={"systems", "versioning"}, location=OptionsDisplayer.ADVANCED, tabTitle="Versioning")
54
public class VcsAdvancedOptionsPanel extends javax.swing.JPanel {
57
public class VcsAdvancedOptionsPanel extends javax.swing.JPanel {
55
58
56
    HashMap<String, JComponent> versioningPanels = new HashMap<String, JComponent>();
59
    HashMap<String, JComponent> versioningPanels = new HashMap<String, JComponent>();
(-)a/versioning.util/src/org/netbeans/modules/versioning/util/options/AnnotationColorsPanel.java (+3 lines)
Lines 64-70 Link Here
64
import java.beans.PropertyChangeEvent;
64
import java.beans.PropertyChangeEvent;
65
import java.util.*;
65
import java.util.*;
66
import org.netbeans.api.editor.settings.EditorStyleConstants;
66
import org.netbeans.api.editor.settings.EditorStyleConstants;
67
import org.netbeans.api.options.OptionsDisplayer;
67
import org.netbeans.modules.versioning.util.OptionsPanelColorProvider;
68
import org.netbeans.modules.versioning.util.OptionsPanelColorProvider;
69
import org.netbeans.spi.options.OptionsPanelController;
68
import org.openide.util.Lookup;
70
import org.openide.util.Lookup;
69
import org.openide.util.LookupListener;
71
import org.openide.util.LookupListener;
70
import org.openide.util.WeakListeners;
72
import org.openide.util.WeakListeners;
Lines 73-78 Link Here
73
 * 
75
 * 
74
 * @author Maros Sandor, Ondra Vrabec
76
 * @author Maros Sandor, Ondra Vrabec
75
 */
77
 */
78
@OptionsPanelController.Keywords(keywords={"versioning", "colors"}, location=OptionsDisplayer.FONTSANDCOLORS, index=4)
76
public class AnnotationColorsPanel extends javax.swing.JPanel implements ActionListener, FontsColorsController, PropertyChangeListener {
79
public class AnnotationColorsPanel extends javax.swing.JPanel implements ActionListener, FontsColorsController, PropertyChangeListener {
77
80
78
    private boolean listen;
81
    private boolean listen;
(-)a/vmd.componentssupport/manifest.mf (-1 / +1 lines)
Lines 3-7 Link Here
3
OpenIDE-Module: org.netbeans.modules.vmd.componentssupport
3
OpenIDE-Module: org.netbeans.modules.vmd.componentssupport
4
OpenIDE-Module-Layer: org/netbeans/modules/vmd/componentssupport/layer.xml
4
OpenIDE-Module-Layer: org/netbeans/modules/vmd/componentssupport/layer.xml
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/vmd/componentssupport/Bundle.properties
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/vmd/componentssupport/Bundle.properties
6
OpenIDE-Module-Specification-Version: 1.16
6
OpenIDE-Module-Specification-Version: 1.17
7
7
(-)a/vmd.componentssupport/nbproject/project.xml (-1 / +1 lines)
Lines 27-33 Link Here
27
                    <compile-dependency/>
27
                    <compile-dependency/>
28
                    <run-dependency>
28
                    <run-dependency>
29
                        <release-version>1</release-version>
29
                        <release-version>1</release-version>
30
                        <specification-version>1.8</specification-version>
30
                        <specification-version>1.28</specification-version>
31
                    </run-dependency>
31
                    </run-dependency>
32
                </dependency>
32
                </dependency>
33
                <dependency>
33
                <dependency>
(-)a/vmd.componentssupport/src/org/netbeans/modules/vmd/componentssupport/options/ComponentssupportPanel.java (+3 lines)
Lines 44-55 Link Here
44
package org.netbeans.modules.vmd.componentssupport.options;
44
package org.netbeans.modules.vmd.componentssupport.options;
45
45
46
import org.netbeans.api.visual.router.RouterFactory;
46
import org.netbeans.api.visual.router.RouterFactory;
47
import org.netbeans.modules.options.java.api.JavaOptions;
48
import org.netbeans.spi.options.OptionsPanelController;
47
import org.openide.util.NbPreferences;
49
import org.openide.util.NbPreferences;
48
50
49
/**
51
/**
50
 *
52
 *
51
 * @author Karol Harezlak
53
 * @author Karol Harezlak
52
 */
54
 */
55
@OptionsPanelController.Keywords(keywords={"java me"}, location=JavaOptions.JAVA, index=4)
53
final class ComponentssupportPanel extends javax.swing.JPanel {
56
final class ComponentssupportPanel extends javax.swing.JPanel {
54
57
55
    private static final String VMD_STRUCTURE_SHOW = "vmd.structure.show"; // NOI18N
58
    private static final String VMD_STRUCTURE_SHOW = "vmd.structure.show"; // NOI18N

Return to bug 218312