Oops, had some files unsaved!

diff --git a/extensions/particle-editor/src/com/badlogic/gdx/graphics/particles/EffectPanel.java b/extensions/particle-editor/src/com/badlogic/gdx/graphics/particles/EffectPanel.java
index e540c7a..e79ba11 100644 (file)
--- a/extensions/particle-editor/src/com/badlogic/gdx/graphics/particles/EffectPanel.java
+++ b/extensions/particle-editor/src/com/badlogic/gdx/graphics/particles/EffectPanel.java
@@ -114,8 +114,8 @@ class EffectPanel extends JPanel {
                lastDir = dir;\r
                synchronized (editor.effect) {\r
                        int index = 0;\r
-                       for (ParticleEmitter particles : editor.effect.getEmitters())\r
-                               particles.setName((String)emitterTableModel.getValueAt(index++, 0));\r
+                       for (ParticleEmitter emitter : editor.effect.getEmitters())\r
+                               emitter.setName((String)emitterTableModel.getValueAt(index++, 0));\r
                        try {\r
                                editor.effect.save(new File(dir, file));\r
                        } catch (Exception ex) {\r
@@ -150,9 +150,9 @@ class EffectPanel extends JPanel {
                        int insertIndex = editIndex + direction;\r
                        Object name = emitterTableModel.getValueAt(editIndex, 0);\r
                        emitterTableModel.removeRow(editIndex);\r
-                       ParticleEmitter particles = emitters.remove(editIndex);\r
+                       ParticleEmitter emitter = emitters.remove(editIndex);\r
                        emitterTableModel.insertRow(insertIndex, new Object[] {name});\r
-                       emitters.add(insertIndex, particles);\r
+                       emitters.add(insertIndex, emitter);\r
                        editIndex = insertIndex;\r
                }\r
                emitterTable.getSelectionModel().setSelectionInterval(editIndex, editIndex);\r

diff --git a/extensions/particle-editor/src/com/badlogic/gdx/graphics/particles/OptionsPanel.java b/extensions/particle-editor/src/com/badlogic/gdx/graphics/particles/OptionsPanel.java
index 578daf6..79c8a02 100644 (file)
--- a/extensions/particle-editor/src/com/badlogic/gdx/graphics/particles/OptionsPanel.java
+++ b/extensions/particle-editor/src/com/badlogic/gdx/graphics/particles/OptionsPanel.java
@@ -67,12 +67,12 @@ class OptionsPanel extends EditorPanel {
                        }\r
                });\r
 \r
-               ParticleEmitter particles = editor.getEmitter();\r
-               attachedCheckBox.setSelected(particles.isAttached());\r
-               continuousCheckbox.setSelected(particles.isContinuous());\r
-               alignedCheckbox.setSelected(particles.isAligned());\r
-               additiveCheckbox.setSelected(particles.isAdditive());\r
-               behindCheckbox.setSelected(particles.isBehind());\r
+               ParticleEmitter emitter = editor.getEmitter();\r
+               attachedCheckBox.setSelected(emitter.isAttached());\r
+               continuousCheckbox.setSelected(emitter.isContinuous());\r
+               alignedCheckbox.setSelected(emitter.isAligned());\r
+               additiveCheckbox.setSelected(emitter.isAdditive());\r
+               behindCheckbox.setSelected(emitter.isBehind());\r
        }\r
 \r
        private void initializeComponents () {\r

diff --git a/gdx/src/com/badlogic/gdx/graphics/particles/ParticleEffect.java b/gdx/src/com/badlogic/gdx/graphics/particles/ParticleEffect.java
index 0e1cf3c..ad146bf 100644 (file)
--- a/gdx/src/com/badlogic/gdx/graphics/particles/ParticleEffect.java
+++ b/gdx/src/com/badlogic/gdx/graphics/particles/ParticleEffect.java
@@ -24,8 +24,8 @@ public class ParticleEffect {
        private ArrayList<ParticleEmitter> emitters = new ArrayList();\r
 \r
        public void start () {\r
-               for (ParticleEmitter particles : emitters)\r
-                       particles.start();\r
+               for (ParticleEmitter emitter : emitters)\r
+                       emitter.start();\r
        }\r
 \r
        public void draw (SpriteBatch spriteBatch, float delta) {\r