hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added workaround for problem introduced in Java 1.7.0_45-b18 with

Browse Source 
DataFlavor being loaded in a different classloader.  We cannot refer to
singletons in the RocketComponent class.
This commit is contained in:
kruland2607 2013-11-04 14:49:20 -06:00
parent 085445ab9c
commit a1944b765f
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
View File

@ -8,7 +8,6 @@ import java.util.NoSuchElementException;
import net.sf.openrocket.appearance.Appearance; import net.sf.openrocket.appearance.Appearance;
import net.sf.openrocket.appearance.Decal; import net.sf.openrocket.appearance.Decal;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.preset.ComponentPreset; import net.sf.openrocket.preset.ComponentPreset;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.ArrayList; import net.sf.openrocket.util.ArrayList;
@ -31,7 +30,12 @@ import org.slf4j.LoggerFactory;
public abstract class RocketComponent implements ChangeSource, Cloneable, Iterable<RocketComponent>, Visitable<RocketComponentVisitor, RocketComponent> { public abstract class RocketComponent implements ChangeSource, Cloneable, Iterable<RocketComponent>, Visitable<RocketComponentVisitor, RocketComponent> {
private static final Logger log = LoggerFactory.getLogger(RocketComponent.class); private static final Logger log = LoggerFactory.getLogger(RocketComponent.class);
private static final Translator trans = Application.getTranslator();
// Because of changes to Java 1.7.0-45's mechanism to construct DataFlavor objects (used in Drag and Drop)
// We cannot access static members of the Application object in this class. Instead of holding
// on to the Translator object, we'll just use when we need it.
//private static final Translator trans = Application.getTranslator();
/* /*
* Text is suitable to the form * Text is suitable to the form
@ -40,19 +44,19 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
public enum Position { public enum Position {
/** Position relative to the top of the parent component. */ /** Position relative to the top of the parent component. */
//// Top of the parent component //// Top of the parent component
TOP(trans.get("RocketComponent.Position.TOP")), TOP(Application.getTranslator().get("RocketComponent.Position.TOP")),
/** Position relative to the middle of the parent component. */ /** Position relative to the middle of the parent component. */
//// Middle of the parent component //// Middle of the parent component
MIDDLE(trans.get("RocketComponent.Position.MIDDLE")), MIDDLE(Application.getTranslator().get("RocketComponent.Position.MIDDLE")),
/** Position relative to the bottom of the parent component. */ /** Position relative to the bottom of the parent component. */
//// Bottom of the parent component //// Bottom of the parent component
BOTTOM(trans.get("RocketComponent.Position.BOTTOM")), BOTTOM(Application.getTranslator().get("RocketComponent.Position.BOTTOM")),
/** Position after the parent component (for body components). */ /** Position after the parent component (for body components). */
//// After the parent component //// After the parent component
AFTER(trans.get("RocketComponent.Position.AFTER")), AFTER(Application.getTranslator().get("RocketComponent.Position.AFTER")),
/** Specify an absolute X-coordinate position. */ /** Specify an absolute X-coordinate position. */
//// Tip of the nose cone //// Tip of the nose cone
ABSOLUTE(trans.get("RocketComponent.Position.ABSOLUTE")); ABSOLUTE(Application.getTranslator().get("RocketComponent.Position.ABSOLUTE"));
private String title; private String title;