From a73cd439bb481d56a6bef0b276de94d8a9849f02 Mon Sep 17 00:00:00 2001 From: "rem..om" Date: Tue, 26 Feb 2013 23:44:46 +0000 Subject: [PATCH] SDK removed generic signature from DefaultComboModel in the SDK git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10447 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../jme3/gde/materialdefinition/dialog/AddAttributeDialog.java | 3 +-- .../materialdefinition/dialog/AddMaterialParameterDialog.java | 2 +- .../gde/materialdefinition/dialog/AddWorldParameterDialog.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddAttributeDialog.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddAttributeDialog.java index 3e815e0f2..9135e73b2 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddAttributeDialog.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddAttributeDialog.java @@ -6,7 +6,6 @@ package com.jme3.gde.materialdefinition.dialog; import com.jme3.gde.materialdefinition.editor.Diagram; import com.jme3.scene.VertexBuffer; -import com.jme3.shader.UniformBinding; import java.awt.Point; 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) { super(parent, modal); initComponents(); - DefaultComboBoxModel model = new DefaultComboBoxModel(); + DefaultComboBoxModel model = new DefaultComboBoxModel(); for (VertexBuffer.Type attr : VertexBuffer.Type.values()) { model.addElement("in" + attr.name()); diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddMaterialParameterDialog.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddMaterialParameterDialog.java index d185aca53..c97ef8585 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddMaterialParameterDialog.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddMaterialParameterDialog.java @@ -25,7 +25,7 @@ public class AddMaterialParameterDialog extends javax.swing.JDialog { public AddMaterialParameterDialog(java.awt.Frame parent, boolean modal, Diagram diagram, Point clickPosition) { super(parent, modal); initComponents(); - DefaultComboBoxModel model = new DefaultComboBoxModel(); + DefaultComboBoxModel model = new DefaultComboBoxModel(); model.addElement("Color"); for (VarType varType : VarType.values()) { diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddWorldParameterDialog.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddWorldParameterDialog.java index fa2a5f60c..c77499773 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddWorldParameterDialog.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddWorldParameterDialog.java @@ -24,7 +24,7 @@ public class AddWorldParameterDialog extends javax.swing.JDialog { public AddWorldParameterDialog(java.awt.Frame parent, boolean modal, Diagram diagram, Point clickPosition) { super(parent, modal); initComponents(); - DefaultComboBoxModel model = new DefaultComboBoxModel(); + DefaultComboBoxModel model = new DefaultComboBoxModel(); for (UniformBinding binding : UniformBinding.values()) { model.addElement(binding);