diff -r 826763494728 ada.project/manifest.mf
--- a/ada.project/manifest.mf Tue Mar 23 18:37:16 2010 -0400
+++ b/ada.project/manifest.mf Thu Mar 25 20:50:23 2010 -0400
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.ada.project
OpenIDE-Module-Layer: org/netbeans/modules/ada/project/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ada/project/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.1.7
+OpenIDE-Module-Specification-Version: 0.2.7
diff -r 826763494728 ada.project/nbproject/project.xml
--- a/ada.project/nbproject/project.xml Tue Mar 23 18:37:16 2010 -0400
+++ b/ada.project/nbproject/project.xml Thu Mar 25 20:50:23 2010 -0400
@@ -73,7 +73,7 @@
1
- 1.31
+ 1.42
diff -r 826763494728 ada.project/src/org/netbeans/modules/ada/project/ui/properties/CustomizerSources.java
--- a/ada.project/src/org/netbeans/modules/ada/project/ui/properties/CustomizerSources.java Tue Mar 23 18:37:16 2010 -0400
+++ b/ada.project/src/org/netbeans/modules/ada/project/ui/properties/CustomizerSources.java Thu Mar 25 20:50:23 2010 -0400
@@ -40,7 +40,6 @@
package org.netbeans.modules.ada.project.ui.properties;
-import java.awt.Component;
import java.awt.Font;
import java.awt.Graphics;
import java.awt.event.ActionEvent;
@@ -49,28 +48,20 @@
import java.awt.event.ComponentEvent;
import java.io.File;
import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CharsetEncoder;
-import java.nio.charset.IllegalCharsetNameException;
import java.util.LinkedList;
import java.util.List;
-import java.util.logging.Logger;
import javax.swing.DefaultCellEditor;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JLabel;
-import javax.swing.JList;
import javax.swing.JTable;
import javax.swing.JTextField;
-import javax.swing.ListCellRenderer;
import javax.swing.ListSelectionModel;
import javax.swing.UIManager;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
-import javax.swing.plaf.UIResource;
import javax.swing.table.TableColumn;
import javax.swing.table.TableModel;
import org.netbeans.modules.ada.project.Pair;
import org.netbeans.modules.ada.project.ui.Utils;
+import org.netbeans.spi.project.ui.support.ProjectCustomizer;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
import org.openide.filesystems.FileObject;
@@ -139,8 +130,8 @@
this.originalEncoding = Charset.defaultCharset().name();
}
- this.encoding.setModel(new EncodingModel(this.originalEncoding));
- this.encoding.setRenderer(new EncodingRenderer());
+ this.encoding.setModel(ProjectCustomizer.encodingModel(this.originalEncoding));
+ this.encoding.setRenderer(ProjectCustomizer.encodingRenderer());
final String lafid = UIManager.getLookAndFeel().getID();
if (!"Aqua".equals(lafid)) { //NOI18N
this.encoding.putClientProperty ("JComboBox.isTableCellEditor", Boolean.TRUE); //NOI18N
@@ -226,35 +217,6 @@
return new HelpCtx(this.getClass());
}
- private static class EncodingRenderer extends JLabel implements ListCellRenderer, UIResource {
-
- public EncodingRenderer() {
- setOpaque(true);
- }
-
- public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
- assert value instanceof Charset;
- setName("ComboBox.listRenderer"); // NOI18N
- setText(((Charset) value).displayName());
- setIcon(null);
- if (isSelected) {
- setBackground(list.getSelectionBackground());
- setForeground(list.getSelectionForeground());
- } else {
- setBackground(list.getBackground());
- setForeground(list.getForeground());
- }
- return this;
- }
-
- @Override
- public String getName() {
- String name = super.getName();
- return name == null ? "ComboBox.renderer" : name; // NOI18N
- }
-
- }
-
private class MediatorListener implements ChangeListener {
public void stateChanged(ChangeEvent e) {
@@ -279,54 +241,6 @@
}
- private static class EncodingModel extends DefaultComboBoxModel {
-
- public EncodingModel (String originalEncoding) {
- Charset defEnc = null;
- for (Charset c : Charset.availableCharsets().values()) {
- if (c.name().equals(originalEncoding)) {
- defEnc = c;
- }
- addElement(c);
- }
- if (defEnc == null) {
- //Create artificial Charset to keep the original value
- //May happen when the project was set up on the platform
- //which supports more encodings
- try {
- defEnc = new UnknownCharset (originalEncoding);
- addElement(defEnc);
- } catch (IllegalCharsetNameException e) {
- //The source.encoding property is completely broken
- Logger.getLogger(this.getClass().getName()).info("IllegalCharsetName: " + originalEncoding);
- }
- }
- if (defEnc == null) {
- defEnc = Charset.defaultCharset();
- }
- setSelectedItem(defEnc);
- }
- }
-
- private static class UnknownCharset extends Charset {
-
- UnknownCharset (String name) {
- super (name, new String[0]);
- }
-
- public boolean contains(Charset c) {
- throw new UnsupportedOperationException();
- }
-
- public CharsetDecoder newDecoder() {
- throw new UnsupportedOperationException();
- }
-
- public CharsetEncoder newEncoder() {
- throw new UnsupportedOperationException();
- }
-}
-
private static class ResizableRowHeightTable extends JTable {
private boolean needResize = true;
diff -r 826763494728 erlang.project/manifest.mf
--- a/erlang.project/manifest.mf Tue Mar 23 18:37:16 2010 -0400
+++ b/erlang.project/manifest.mf Thu Mar 25 20:50:23 2010 -0400
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.erlang.project
OpenIDE-Module-Layer: org/netbeans/modules/erlang/project/ui/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/erlang/project/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.17.0
+OpenIDE-Module-Specification-Version: 0.18.0
diff -r 826763494728 erlang.project/nbproject/project.xml
--- a/erlang.project/nbproject/project.xml Tue Mar 23 18:37:16 2010 -0400
+++ b/erlang.project/nbproject/project.xml Thu Mar 25 20:50:23 2010 -0400
@@ -116,7 +116,7 @@
1
- 1.31
+ 1.42
diff -r 826763494728 erlang.project/src/org/netbeans/modules/erlang/project/ui/customizer/CustomizerSources.java
--- a/erlang.project/src/org/netbeans/modules/erlang/project/ui/customizer/CustomizerSources.java Tue Mar 23 18:37:16 2010 -0400
+++ b/erlang.project/src/org/netbeans/modules/erlang/project/ui/customizer/CustomizerSources.java Thu Mar 25 20:50:23 2010 -0400
@@ -41,21 +41,12 @@
package org.netbeans.modules.erlang.project.ui.customizer;
-import java.awt.Component;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CharsetEncoder;
-import java.nio.charset.IllegalCharsetNameException;
-import java.util.logging.Logger;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.ListCellRenderer;
-import javax.swing.plaf.UIResource;
import java.io.File;
import java.nio.charset.Charset;
import org.netbeans.modules.erlang.project.RubyProject;
+import org.netbeans.spi.project.ui.support.ProjectCustomizer;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.HelpCtx;
@@ -111,8 +102,8 @@
this.originalEncoding = Charset.defaultCharset().name();
}
- this.encoding.setModel(new EncodingModel(this.originalEncoding));
- this.encoding.setRenderer(new EncodingRenderer());
+ this.encoding.setModel(ProjectCustomizer.encodingModel(this.originalEncoding));
+ this.encoding.setRenderer(ProjectCustomizer.encodingRenderer());
this.encoding.addActionListener(new ActionListener () {
@@ -138,83 +129,6 @@
return new HelpCtx (CustomizerSources.class);
}
- private static class EncodingRenderer extends JLabel implements ListCellRenderer, UIResource {
-
- public EncodingRenderer() {
- setOpaque(true);
- }
-
- public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
- assert value instanceof Charset;
- setName("ComboBox.listRenderer"); // NOI18N
- setText(((Charset) value).displayName());
- setIcon(null);
- if (isSelected) {
- setBackground(list.getSelectionBackground());
- setForeground(list.getSelectionForeground());
- } else {
- setBackground(list.getBackground());
- setForeground(list.getForeground());
- }
- return this;
- }
-
- @Override
- public String getName() {
- String name = super.getName();
- return name == null ? "ComboBox.renderer" : name; // NOI18N
- }
-
- }
-
- private static class EncodingModel extends DefaultComboBoxModel {
-
- public EncodingModel (String originalEncoding) {
- Charset defEnc = null;
- for (Charset c : Charset.availableCharsets().values()) {
- if (c.name().equals(originalEncoding)) {
- defEnc = c;
- }
- addElement(c);
- }
- if (defEnc == null) {
- //Create artificial Charset to keep the original value
- //May happen when the project was set up on the platform
- //which supports more encodings
- try {
- defEnc = new UnknownCharset (originalEncoding);
- addElement(defEnc);
- } catch (IllegalCharsetNameException e) {
- //The source.encoding property is completely broken
- Logger.getLogger(this.getClass().getName()).info("IllegalCharsetName: " + originalEncoding);
- }
- }
- if (defEnc == null) {
- defEnc = Charset.defaultCharset();
- }
- setSelectedItem(defEnc);
- }
- }
-
- private static class UnknownCharset extends Charset {
-
- UnknownCharset (String name) {
- super (name, new String[0]);
- }
-
- public boolean contains(Charset c) {
- throw new UnsupportedOperationException();
- }
-
- public CharsetDecoder newDecoder() {
- throw new UnsupportedOperationException();
- }
-
- public CharsetEncoder newEncoder() {
- throw new UnsupportedOperationException();
- }
-}
-
/** This method is called from within the constructor to
* initialize the form.
* WARNING: Do NOT modify this code. The content of this method is
diff -r 826763494728 scala.project/manifest.mf
--- a/scala.project/manifest.mf Tue Mar 23 18:37:16 2010 -0400
+++ b/scala.project/manifest.mf Thu Mar 25 20:50:23 2010 -0400
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.scala.project
OpenIDE-Module-Layer: org/netbeans/modules/scala/project/ui/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/scala/project/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.4
+OpenIDE-Module-Specification-Version: 1.5
diff -r 826763494728 scala.project/nbproject/project.xml
--- a/scala.project/nbproject/project.xml Tue Mar 23 18:37:16 2010 -0400
+++ b/scala.project/nbproject/project.xml Thu Mar 25 20:50:23 2010 -0400
@@ -225,7 +225,7 @@
1
- 1.31
+ 1.42
diff -r 826763494728 scala.project/src/org/netbeans/modules/scala/project/ui/customizer/CustomizerSources.java
--- a/scala.project/src/org/netbeans/modules/scala/project/ui/customizer/CustomizerSources.java Tue Mar 23 18:37:16 2010 -0400
+++ b/scala.project/src/org/netbeans/modules/scala/project/ui/customizer/CustomizerSources.java Thu Mar 25 20:50:23 2010 -0400
@@ -41,7 +41,6 @@
package org.netbeans.modules.scala.project.ui.customizer;
-import java.awt.Component;
import java.awt.Font;
import java.awt.Graphics;
import java.awt.event.ActionEvent;
@@ -50,25 +49,17 @@
import java.awt.event.ComponentEvent;
import java.io.File;
import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CharsetEncoder;
-import java.nio.charset.IllegalCharsetNameException;
-import java.util.logging.Logger;
import javax.swing.DefaultCellEditor;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JLabel;
-import javax.swing.JList;
import javax.swing.JTable;
import javax.swing.JTextField;
-import javax.swing.ListCellRenderer;
import javax.swing.ListSelectionModel;
import javax.swing.UIManager;
import javax.swing.event.ListDataEvent;
import javax.swing.event.ListDataListener;
-import javax.swing.plaf.UIResource;
import javax.swing.table.TableColumn;
import javax.swing.table.TableModel;
import org.netbeans.spi.java.project.support.ui.IncludeExcludeVisualizer;
+import org.netbeans.spi.project.ui.support.ProjectCustomizer;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
@@ -149,8 +140,8 @@
this.originalEncoding = Charset.defaultCharset().name();
}
- this.encoding.setModel(new EncodingModel(this.originalEncoding));
- this.encoding.setRenderer(new EncodingRenderer());
+ this.encoding.setModel(ProjectCustomizer.encodingModel(this.originalEncoding));
+ this.encoding.setRenderer(ProjectCustomizer.encodingRenderer());
final String lafid = UIManager.getLookAndFeel().getID();
if (!"Aqua".equals(lafid)) { //NOI18N
this.encoding.putClientProperty ("JComboBox.isTableCellEditor", Boolean.TRUE); //NOI18N
@@ -240,84 +231,6 @@
this.sourceLevel.setEnabled(sourceLevel.getItemCount()>0);
}
-
- private static class EncodingRenderer extends JLabel implements ListCellRenderer, UIResource {
-
- public EncodingRenderer() {
- setOpaque(true);
- }
-
- public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
- assert value instanceof Charset;
- setName("ComboBox.listRenderer"); // NOI18N
- setText(((Charset) value).displayName());
- setIcon(null);
- if (isSelected) {
- setBackground(list.getSelectionBackground());
- setForeground(list.getSelectionForeground());
- } else {
- setBackground(list.getBackground());
- setForeground(list.getForeground());
- }
- return this;
- }
-
- @Override
- public String getName() {
- String name = super.getName();
- return name == null ? "ComboBox.renderer" : name; // NOI18N
- }
-
- }
-
- private static class EncodingModel extends DefaultComboBoxModel {
-
- public EncodingModel (String originalEncoding) {
- Charset defEnc = null;
- for (Charset c : Charset.availableCharsets().values()) {
- if (c.name().equals(originalEncoding)) {
- defEnc = c;
- }
- addElement(c);
- }
- if (defEnc == null) {
- //Create artificial Charset to keep the original value
- //May happen when the project was set up on the platform
- //which supports more encodings
- try {
- defEnc = new UnknownCharset (originalEncoding);
- addElement(defEnc);
- } catch (IllegalCharsetNameException e) {
- //The source.encoding property is completely broken
- Logger.getLogger(this.getClass().getName()).info("IllegalCharsetName: " + originalEncoding);
- }
- }
- if (defEnc == null) {
- defEnc = Charset.defaultCharset();
- }
- setSelectedItem(defEnc);
- }
- }
-
- private static class UnknownCharset extends Charset {
-
- UnknownCharset (String name) {
- super (name, new String[0]);
- }
-
- public boolean contains(Charset c) {
- throw new UnsupportedOperationException();
- }
-
- public CharsetDecoder newDecoder() {
- throw new UnsupportedOperationException();
- }
-
- public CharsetEncoder newEncoder() {
- throw new UnsupportedOperationException();
- }
-}
-
private static class ResizableRowHeightTable extends JTable {
private boolean needResize = true;