Main repository of MikuMikuStudio
| Revision | eabac562056bb016cb9106c596f02536be07fdc8 (tree) |
|---|---|
| Time | 2013-02-27 08:44:46 |
| Author | remy.bouquet@gmail.com <remy.bouquet@gmai...> |
| Commiter | remy.bouquet@gmail.com |
SDK removed generic signature from DefaultComboModel in the SDK
git-svn-id: http://jmonkeyengine.googlecode.com/svn/trunk@10447 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddAttributeDialog.java (diff) sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddMaterialParameterDialog.java (diff) sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddWorldParameterDialog.java (diff)| @@ -6,7 +6,6 @@ package com.jme3.gde.materialdefinition.dialog; | ||
| 6 | 6 | |
| 7 | 7 | import com.jme3.gde.materialdefinition.editor.Diagram; |
| 8 | 8 | import com.jme3.scene.VertexBuffer; |
| 9 | -import com.jme3.shader.UniformBinding; | |
| 10 | 9 | import java.awt.Point; |
| 11 | 10 | import javax.swing.DefaultComboBoxModel; |
| 12 | 11 |
| @@ -25,7 +24,7 @@ public class AddAttributeDialog extends javax.swing.JDialog { | ||
| 25 | 24 | public AddAttributeDialog(java.awt.Frame parent, boolean modal, Diagram diagram, Point clickPosition) { |
| 26 | 25 | super(parent, modal); |
| 27 | 26 | initComponents(); |
| 28 | - DefaultComboBoxModel<String> model = new DefaultComboBoxModel<String>(); | |
| 27 | + DefaultComboBoxModel model = new DefaultComboBoxModel(); | |
| 29 | 28 | |
| 30 | 29 | for (VertexBuffer.Type attr : VertexBuffer.Type.values()) { |
| 31 | 30 | model.addElement("in" + attr.name()); |
| @@ -25,7 +25,7 @@ public class AddMaterialParameterDialog extends javax.swing.JDialog { | ||
| 25 | 25 | public AddMaterialParameterDialog(java.awt.Frame parent, boolean modal, Diagram diagram, Point clickPosition) { |
| 26 | 26 | super(parent, modal); |
| 27 | 27 | initComponents(); |
| 28 | - DefaultComboBoxModel<String> model = new DefaultComboBoxModel<String>(); | |
| 28 | + DefaultComboBoxModel model = new DefaultComboBoxModel(); | |
| 29 | 29 | model.addElement("Color"); |
| 30 | 30 | for (VarType varType : VarType.values()) { |
| 31 | 31 |
| @@ -24,7 +24,7 @@ public class AddWorldParameterDialog extends javax.swing.JDialog { | ||
| 24 | 24 | public AddWorldParameterDialog(java.awt.Frame parent, boolean modal, Diagram diagram, Point clickPosition) { |
| 25 | 25 | super(parent, modal); |
| 26 | 26 | initComponents(); |
| 27 | - DefaultComboBoxModel<UniformBinding> model = new DefaultComboBoxModel<UniformBinding>(); | |
| 27 | + DefaultComboBoxModel model = new DefaultComboBoxModel(); | |
| 28 | 28 | |
| 29 | 29 | for (UniformBinding binding : UniformBinding.values()) { |
| 30 | 30 | model.addElement(binding); |
Fork