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

* Fix issue 574 (by extending JFrame instead of JDialog)

Browse Source 
* Fix issue 561 by throwing exception on invalid values

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10570 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
ShA..Rd 2013-04-19 18:01:17 +00:00
parent 6e021b4504
commit 06c4dcd7f7
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/src/core/com/jme3/scene/shape/Sphere.java
View File

@ -383,10 +383,16 @@ public class Sphere extends Mesh {
* @param radius the radius of the sphere. * @param radius the radius of the sphere.
*/ */
public void updateGeometry(int zSamples, int radialSamples, float radius) { public void updateGeometry(int zSamples, int radialSamples, float radius) {
if (zSamples < 3) {
throw new IllegalArgumentException("zSamples cannot be smaller than 3");
}
updateGeometry(zSamples, radialSamples, radius, false, false); updateGeometry(zSamples, radialSamples, radius, false, false);
} }
public void updateGeometry(int zSamples, int radialSamples, float radius, boolean useEvenSlices, boolean interior) { public void updateGeometry(int zSamples, int radialSamples, float radius, boolean useEvenSlices, boolean interior) {
if (zSamples < 3) {
throw new IllegalArgumentException("zSamples cannot be smaller than 3");
}
this.zSamples = zSamples; this.zSamples = zSamples;
this.radialSamples = radialSamples; this.radialSamples = radialSamples;
this.radius = radius; this.radius = radius;

4
engine/src/desktop/com/jme3/app/SettingsDialog.java
View File

@ -59,7 +59,7 @@ import javax.swing.*;
* @author Eric Woroshow * @author Eric Woroshow
* @author Joshua Slack - reworked for proper use of GL commands. * @author Joshua Slack - reworked for proper use of GL commands.
*/ */
public final class SettingsDialog extends JDialog { public final class SettingsDialog extends JFrame {
public static interface SelectionListener { public static interface SelectionListener {
@ -141,7 +141,7 @@ public final class SettingsDialog extends JDialog {
this.source = source; this.source = source;
this.imageFile = imageFile; this.imageFile = imageFile;
setModal(true); //setModal(true);
setAlwaysOnTop(true); setAlwaysOnTop(true);
setResizable(false); setResizable(false);