sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SDK removed generic signature from DefaultComboModel in the SDK

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10447 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
rem..om 2013-02-26 23:44:46 +00:00
parent ec7624e10d
commit a73cd439bb
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddAttributeDialog.java
View File

@ -6,7 +6,6 @@ package com.jme3.gde.materialdefinition.dialog;
import com.jme3.gde.materialdefinition.editor.Diagram; import com.jme3.gde.materialdefinition.editor.Diagram;
import com.jme3.scene.VertexBuffer; import com.jme3.scene.VertexBuffer;
import com.jme3.shader.UniformBinding;
import java.awt.Point; import java.awt.Point;
import javax.swing.DefaultComboBoxModel; import javax.swing.DefaultComboBoxModel;
@ -25,7 +24,7 @@ public class AddAttributeDialog extends javax.swing.JDialog {
public AddAttributeDialog(java.awt.Frame parent, boolean modal, Diagram diagram, Point clickPosition) { public AddAttributeDialog(java.awt.Frame parent, boolean modal, Diagram diagram, Point clickPosition) {
super(parent, modal); super(parent, modal);
initComponents(); initComponents();
DefaultComboBoxModel<String> model = new DefaultComboBoxModel<String>(); DefaultComboBoxModel model = new DefaultComboBoxModel();
for (VertexBuffer.Type attr : VertexBuffer.Type.values()) { for (VertexBuffer.Type attr : VertexBuffer.Type.values()) {
model.addElement("in" + attr.name()); model.addElement("in" + attr.name());

2
sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddMaterialParameterDialog.java
View File

@ -25,7 +25,7 @@ public class AddMaterialParameterDialog extends javax.swing.JDialog {
public AddMaterialParameterDialog(java.awt.Frame parent, boolean modal, Diagram diagram, Point clickPosition) { public AddMaterialParameterDialog(java.awt.Frame parent, boolean modal, Diagram diagram, Point clickPosition) {
super(parent, modal); super(parent, modal);
initComponents(); initComponents();
DefaultComboBoxModel<String> model = new DefaultComboBoxModel<String>(); DefaultComboBoxModel model = new DefaultComboBoxModel();
model.addElement("Color"); model.addElement("Color");
for (VarType varType : VarType.values()) { for (VarType varType : VarType.values()) {

2
sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddWorldParameterDialog.java
View File

@ -24,7 +24,7 @@ public class AddWorldParameterDialog extends javax.swing.JDialog {
public AddWorldParameterDialog(java.awt.Frame parent, boolean modal, Diagram diagram, Point clickPosition) { public AddWorldParameterDialog(java.awt.Frame parent, boolean modal, Diagram diagram, Point clickPosition) {
super(parent, modal); super(parent, modal);
initComponents(); initComponents();
DefaultComboBoxModel<UniformBinding> model = new DefaultComboBoxModel<UniformBinding>(); DefaultComboBoxModel model = new DefaultComboBoxModel();
for (UniformBinding binding : UniformBinding.values()) { for (UniformBinding binding : UniformBinding.values()) {
model.addElement(binding); model.addElement(binding);