deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

minor fix: visualized plugins z-order was not correctly loaded

Browse source
This commit is contained in:
fros4943 2010-09-24 12:48:04 +00:00
parent ec63e067ee
commit 7b31e571e2
1 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
tools/cooja/java/se/sics/cooja/GUI.java
View file

@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: GUI.java,v 1.170 2010/06/11 09:10:52 fros4943 Exp $ * $Id: GUI.java,v 1.171 2010/09/24 12:48:04 fros4943 Exp $
*/ */
package se.sics.cooja; package se.sics.cooja;
@ -3608,7 +3608,6 @@ public class GUI extends Observable {
startedPlugin.getGUI().setSize(size); startedPlugin.getGUI().setSize(size);
} else if (pluginSubElement.getName().equals("z")) { } else if (pluginSubElement.getName().equals("z")) {
int zOrder = Integer.parseInt(pluginSubElement.getText()); int zOrder = Integer.parseInt(pluginSubElement.getText());
// Save z order as temporary client property
startedPlugin.getGUI().putClientProperty("zorder", zOrder); startedPlugin.getGUI().putClientProperty("zorder", zOrder);
} else if (pluginSubElement.getName().equals("location_x")) { } else if (pluginSubElement.getName().equals("location_x")) {
location.x = Integer.parseInt(pluginSubElement.getText()); location.x = Integer.parseInt(pluginSubElement.getText());
@ -3632,17 +3631,6 @@ public class GUI extends Observable {
} }
} }
// For all visualized plugins, check if they have a zorder property
try {
for (JInternalFrame plugin : getDesktopPane().getAllFrames()) {
if (plugin.getClientProperty("zorder") != null) {
getDesktopPane().setComponentZOrder(plugin,
((Integer) plugin.getClientProperty("zorder")).intValue());
plugin.putClientProperty("zorder", null);
}
}
} catch (Exception e) { }
showPlugin(startedPlugin); showPlugin(startedPlugin);
return true; return true;
} }
@ -3651,6 +3639,28 @@ public class GUI extends Observable {
} }
} }
/* Z order visualized plugins */
try {
for (int z=0; z < getDesktopPane().getAllFrames().length; z++) {
for (JInternalFrame plugin : getDesktopPane().getAllFrames()) {
if (plugin.getClientProperty("zorder") == null) {
continue;
}
int zOrder = ((Integer) plugin.getClientProperty("zorder")).intValue();
if (zOrder != z) {
continue;
}
getDesktopPane().setComponentZOrder(plugin, zOrder);
if (z == 0) {
plugin.setSelected(true);
}
plugin.putClientProperty("zorder", null);
break;
}
getDesktopPane().repaint();
}
} catch (Exception e) { }
return true; return true;
} }