aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2012-02-21 08:32:04 -0800
committerHarvey Harrison <harvey.harrison@gmail.com>2012-02-21 08:32:04 -0800
commitf602255518bc07ec55ef2137e1b1099cbccbb452 (patch)
treee2b9ce0ddc37650fb0a85bf761370343b93c14ec /src
parentf38135af0a367cbfacf34bf2de29f2f87ecd15b0 (diff)
j3dcore: remove code that was stubbed-out in issue 458
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/classes/share/javax/media/j3d/VirtualUniverse.java31
-rw-r--r--src/classes/share/javax/media/j3d/WakeupOnAWTEvent.java6
2 files changed, 1 insertions, 36 deletions
diff --git a/src/classes/share/javax/media/j3d/VirtualUniverse.java b/src/classes/share/javax/media/j3d/VirtualUniverse.java
index d5c395c..38ab3ae 100644
--- a/src/classes/share/javax/media/j3d/VirtualUniverse.java
+++ b/src/classes/share/javax/media/j3d/VirtualUniverse.java
@@ -390,7 +390,7 @@ ArrayList<Integer> viewIdFreeList = new ArrayList<Integer>();
/**
* Returns the enumeration object of all locales in this virtual universe.
- *
+ *
* @return the enumeration object
*/
public Enumeration<Locale> getAllLocales() {
@@ -680,7 +680,6 @@ synchronized ViewPlatformRetained[] getViewPlatformList() {
}
void checkForEnableEvents() {
- enableComponentEvents();
if (enableFocus) {
enableFocusEvents();
}
@@ -699,34 +698,6 @@ synchronized ViewPlatformRetained[] getViewPlatformList() {
}
- void enableComponentEvents() {
- // Issue 458 - This method is now a noop
- /*
- Enumeration cvs;
- Canvas3D cv;
- ViewPlatformRetained vp;
- View views[];
- Object[] vps = getViewPlatformList();
-
- if (vps != null) {
- for (int i=0; i<vps.length; i++) {
- vp =(ViewPlatformRetained)vps[i];
- views = vp.getViewList();
- for (int j=views.length-1; j>=0; j--) {
- cvs = views[j].getAllCanvas3Ds();
- while(cvs.hasMoreElements()) {
- cv = (Canvas3D) cvs.nextElement();
- // offscreen canvas does not have event catcher
- if (cv.eventCatcher != null) {
- cv.eventCatcher.enableComponentEvents();
- }
- }
- }
- }
- }
- */
- }
-
void disableFocusEvents() {
ViewPlatformRetained vp;
View views[];
diff --git a/src/classes/share/javax/media/j3d/WakeupOnAWTEvent.java b/src/classes/share/javax/media/j3d/WakeupOnAWTEvent.java
index e250889..c7bf22e 100644
--- a/src/classes/share/javax/media/j3d/WakeupOnAWTEvent.java
+++ b/src/classes/share/javax/media/j3d/WakeupOnAWTEvent.java
@@ -32,7 +32,6 @@
package javax.media.j3d;
import java.awt.AWTEvent;
-import java.awt.event.ComponentEvent;
import java.awt.event.FocusEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
@@ -127,11 +126,6 @@ void addAWTEvent(AWTEvent event) {
*/
void resetBehaviorCondition(BehaviorStructure bs) {
if (enableAWTEventTS != bs.awtEventTimestamp) {
- if ((AwtId >= ComponentEvent.COMPONENT_FIRST &&
- AwtId <= ComponentEvent.COMPONENT_LAST) ||
- (EventMask & AWTEvent.COMPONENT_EVENT_MASK) != 0) {
- behav.universe.enableComponentEvents();
- }
if ((AwtId >= FocusEvent.FOCUS_FIRST && AwtId <= FocusEvent.FOCUS_LAST) ||
(EventMask & AWTEvent.FOCUS_EVENT_MASK) != 0) {
behav.universe.enableFocusEvents();