[openwonderland] r4891 committed - added changes for JOGL 2 to modules

1 view
Skip to first unread message

openwon...@googlecode.com

unread,
Jul 18, 2013, 9:45:59 AM7/18/13
to openwonder...@googlegroups.com
Revision: 4891
Author: vdju...@gmail.com
Date: Thu Jul 18 06:45:19 2013
Log: added changes for JOGL 2 to modules
http://code.google.com/p/openwonderland/source/detail?r=4891

Added:

/trunk/modules/tools/xapps-config/src/classes/org/jdesktop/wonderland/modules/xappsconfig/client/resources

/trunk/modules/tools/xapps-config/src/classes/org/jdesktop/wonderland/modules/xappsconfig/client/resources/X11-icon.png
Modified:

/trunk/modules/tools/audio-manager/src/classes/org/jdesktop/wonderland/modules/audiomanager/client/AudioManagerClient.java

/trunk/modules/tools/audio-manager/src/classes/org/jdesktop/wonderland/modules/audiomanager/server/AudioManagerConnectionHandler.java

/trunk/modules/tools/user-list/src/classes/org/jdesktop/wonderland/modules/userlist/client/HUDTabbedPanel.form

/trunk/modules/tools/user-list/src/classes/org/jdesktop/wonderland/modules/userlist/client/HUDTabbedPanel.java

/trunk/modules/tools/user-list/src/classes/org/jdesktop/wonderland/modules/userlist/client/views/WonderlandUserListView.form

/trunk/modules/tools/user-list/src/classes/org/jdesktop/wonderland/modules/userlist/client/views/WonderlandUserListView.java
/trunk/modules/tools/xapps-config/build.xml

/trunk/modules/tools/xapps-config/src/classes/org/jdesktop/wonderland/modules/xappsconfig/client/XAppCellFactory.java
/trunk/modules/world/avatarbase/lib/avatars.jar

/trunk/modules/world/avatarbase/src/classes/org/jdesktop/wonderland/modules/avatarbase/client/jme/cellrenderer/AvatarImiJME.java

=======================================
--- /dev/null
+++
/trunk/modules/tools/xapps-config/src/classes/org/jdesktop/wonderland/modules/xappsconfig/client/resources/X11-icon.png
Thu Jul 18 06:45:19 2013
Binary file, no diff available.
=======================================
---
/trunk/modules/tools/audio-manager/src/classes/org/jdesktop/wonderland/modules/audiomanager/client/AudioManagerClient.java
Mon Apr 30 14:52:39 2012
+++
/trunk/modules/tools/audio-manager/src/classes/org/jdesktop/wonderland/modules/audiomanager/client/AudioManagerClient.java
Thu Jul 18 06:45:19 2013
@@ -1142,9 +1142,13 @@
System.setProperty(
"org.jdesktop.wonderland.modules.audiomanager.client.PHONE_NUMBER", "");

+ String x = System.getProperty("x");
+ String y = System.getProperty("y");
+ String z = System.getProperty("z");
+
if (phoneNumber != null && phoneNumber.length() > 0) {
sendMessage(new PlaceCallRequestMessage(presenceInfo,
phoneNumber,
- 0., 0., 0., 90., false));
+ Double.parseDouble(x), Double.parseDouble(y),
Double.parseDouble(z), 90., false));
return;
}

@@ -1204,7 +1208,7 @@
if (sipURL != null) {
// XXX need location and direction
sendMessage(new PlaceCallRequestMessage(
- presenceInfo, sipURL, 0., 0., 0., 90., false));
+ presenceInfo, sipURL, Double.parseDouble(x),
Double.parseDouble(y), Double.parseDouble(z), 90., false));
} else {
logger.warning("Failed to start softphone, retrying.");

=======================================
---
/trunk/modules/tools/audio-manager/src/classes/org/jdesktop/wonderland/modules/audiomanager/server/AudioManagerConnectionHandler.java
Mon Feb 22 02:03:31 2010
+++
/trunk/modules/tools/audio-manager/src/classes/org/jdesktop/wonderland/modules/audiomanager/server/AudioManagerConnectionHandler.java
Thu Jul 18 06:45:19 2013
@@ -480,7 +480,12 @@
ps.orientation = direction;
ps.isLivePlayer = true;

- Player player = vm.createPlayer(callID, ps);
+ Player player = null;
+ if(p==null) {
+ player = vm.createPlayer(callID, ps);
+ } else {
+ player = p;
+ }

call.setPlayer(player);
player.setCall(call);
=======================================
---
/trunk/modules/tools/user-list/src/classes/org/jdesktop/wonderland/modules/userlist/client/HUDTabbedPanel.form
Mon Apr 30 14:51:31 2012
+++
/trunk/modules/tools/user-list/src/classes/org/jdesktop/wonderland/modules/userlist/client/HUDTabbedPanel.form
Thu Jul 18 06:45:19 2013
@@ -3,7 +3,7 @@
<Form version="1.3" maxVersion="1.7"
type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<Properties>
<Property name="preferredSize" type="java.awt.Dimension"
editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[194, 300]"/>
+ <Dimension value="[220, 330]"/>
</Property>
</Properties>
<AuxValues>
@@ -21,14 +21,14 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="tabbedPanel" alignment="0" max="32767"
attributes="0"/>
+ <Component id="tabbedPanel" alignment="0" pref="234" max="32767"
attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
- <Component id="tabbedPanel" pref="294" max="32767"
attributes="0"/>
+ <Component id="tabbedPanel" pref="289" max="32767"
attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -37,7 +37,7 @@
<Container class="javax.swing.JTabbedPane" name="tabbedPanel">
<Properties>
<Property name="preferredSize" type="java.awt.Dimension"
editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[194, 300]"/>
+ <Dimension value="[220, 320]"/>
</Property>
</Properties>

=======================================
---
/trunk/modules/tools/user-list/src/classes/org/jdesktop/wonderland/modules/userlist/client/HUDTabbedPanel.java
Wed May 30 22:11:44 2012
+++
/trunk/modules/tools/user-list/src/classes/org/jdesktop/wonderland/modules/userlist/client/HUDTabbedPanel.java
Thu Jul 18 06:45:19 2013
@@ -83,21 +83,21 @@

tabbedPanel = new javax.swing.JTabbedPane();

- setPreferredSize(new java.awt.Dimension(194, 300));
+ setPreferredSize(new java.awt.Dimension(220, 330));

- tabbedPanel.setPreferredSize(new java.awt.Dimension(194, 300));
+ tabbedPanel.setPreferredSize(new java.awt.Dimension(220, 320));

org.jdesktop.layout.GroupLayout layout = new
org.jdesktop.layout.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(

layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tabbedPanel,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(tabbedPanel,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 234, Short.MAX_VALUE)
);
layout.setVerticalGroup(

layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(layout.createSequentialGroup()
.addContainerGap()
- .add(tabbedPanel,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 290, Short.MAX_VALUE))
+ .add(tabbedPanel,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 289, Short.MAX_VALUE))
);
}// </editor-fold>//GEN-END:initComponents

=======================================
---
/trunk/modules/tools/user-list/src/classes/org/jdesktop/wonderland/modules/userlist/client/views/WonderlandUserListView.form
Mon Apr 30 14:51:31 2012
+++
/trunk/modules/tools/user-list/src/classes/org/jdesktop/wonderland/modules/userlist/client/views/WonderlandUserListView.form
Thu Jul 18 06:45:19 2013
@@ -3,7 +3,7 @@
<Form version="1.5" maxVersion="1.5"
type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<Properties>
<Property name="preferredSize" type="java.awt.Dimension"
editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[194, 300]"/>
+ <Dimension value="[194, 310]"/>
</Property>
</Properties>
<AuxValues>
@@ -22,7 +22,7 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="userListScrollPane" alignment="0" min="-2"
pref="197" max="-2" attributes="2"/>
+ <Component id="userListScrollPane" alignment="0" pref="197"
max="32767" attributes="2"/>
<Component id="controlPanel" alignment="0" max="32767"
attributes="2"/>
<Component id="jPanel1" alignment="0" pref="197" max="32767"
attributes="0"/>
</Group>
@@ -30,9 +30,9 @@
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
- <Component id="userListScrollPane" pref="205" max="32767"
attributes="0"/>
+ <Component id="userListScrollPane" pref="186" max="32767"
attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
- <Component id="controlPanel" max="32767" attributes="0"/>
+ <Component id="controlPanel" min="-2" max="-2"
attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="jPanel1" min="-2" pref="14" max="-2"
attributes="0"/>
</Group>
@@ -45,55 +45,59 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
+ <Component id="jPanel2" alignment="0" max="32767"
attributes="0"/>
<Group type="102" attributes="0">
- <EmptySpace min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" alignment="0" attributes="0">
- <Component id="muteButton" min="-2" max="-2"
attributes="1"/>
- <EmptySpace min="-2" pref="3" max="-2"
attributes="0"/>
- <Component id="textChatButton" min="-2" max="-2"
attributes="1"/>
- <EmptySpace min="-2" pref="3" max="-2"
attributes="0"/>
- <Component id="voiceChatButton" min="-2"
max="-2" attributes="1"/>
- <EmptySpace min="-2" pref="3" max="-2"
attributes="0"/>
- <Component id="phoneButton" min="-2" max="-2"
attributes="1"/>
- <EmptySpace min="-2" pref="3" max="-2"
attributes="0"/>
- <Component id="gotoUserButton" min="-2" max="-2"
attributes="1"/>
- <EmptySpace min="-2" pref="3" max="-2"
attributes="0"/>
- <Component id="editButton" min="-2" max="-2"
attributes="1"/>
- <EmptySpace min="-2" pref="2" max="-2"
attributes="0"/>
- <Component id="propertiesButton" min="-2"
max="-2" attributes="1"/>
- </Group>
- <Component id="volumeLabel" alignment="0" pref="0"
max="32767" attributes="1"/>
+ <Component id="volumeLabel" pref="0" max="32767"
attributes="1"/>
<Component id="volumeSlider" alignment="0" pref="0"
max="32767" attributes="0"/>
</Group>
- <EmptySpace min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="propertiesButton" alignment="0"
min="-2" max="-2" attributes="0"/>
- <Component id="textChatButton" min="-2" max="-2"
attributes="0"/>
- <Component id="muteButton" min="-2" max="-2"
attributes="0"/>
- <Component id="voiceChatButton" min="-2" max="-2"
attributes="0"/>
- <Component id="phoneButton" min="-2" max="-2"
attributes="0"/>
- <Component id="gotoUserButton" min="-2" max="-2"
attributes="0"/>
- <Component id="editButton" min="-2" max="-2"
attributes="0"/>
- </Group>
- <EmptySpace max="32767" attributes="0"/>
+ <Component id="jPanel2" min="-2" max="-2"
attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
<Component id="volumeLabel" min="-2" max="-2"
attributes="0"/>
- <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
<Component id="volumeSlider" min="-2" pref="23" max="-2"
attributes="0"/>
- <EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
+ <EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
+ <Component class="javax.swing.JLabel" name="volumeLabel">
+ <Properties>
+ <Property name="text" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString
bundle="org/jdesktop/wonderland/modules/userlist/client/resources/Bundle.properties"
key="UserListHUDPanel.volumeLabel.text"
replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
+ </Property>
+ </Properties>
+ </Component>
+ <Component class="javax.swing.JSlider" name="volumeSlider">
+ <Properties>
+ <Property name="minorTickSpacing" type="int" value="10"/>
+ <Property name="paintTicks" type="boolean" value="true"/>
+ </Properties>
+ </Component>
+ <Container class="javax.swing.JPanel" name="jPanel2">
+
+ <Layout
class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout">
+ <Property name="columns" type="int" value="0"/>
+ <Property name="rows" type="int" value="1"/>
+ </Layout>
+ <SubComponents>
<Component class="javax.swing.JButton" name="muteButton">
<Properties>
+ <Property name="background" type="java.awt.Color"
editor="org.netbeans.beaninfo.editors.ColorEditor">
+ <Color blue="ff" green="ff" red="ff" type="rgb"/>
+ </Property>
+ <Property name="foreground" type="java.awt.Color"
editor="org.netbeans.beaninfo.editors.ColorEditor">
+ <Color blue="ff" green="ff" red="ff" type="rgb"/>
+ </Property>
<Property name="icon" type="javax.swing.Icon"
editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3"
name="/org/jdesktop/wonderland/modules/userlist/client/resources/UserListMicMuteOff24x24.png"/>
</Property>
@@ -101,6 +105,7 @@
<ResourceString
bundle="org/jdesktop/wonderland/modules/userlist/client/resources/Bundle.properties"
key="UserListHUDPanel.muteButton.toolTipText"
replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
</Property>
<Property name="borderPainted" type="boolean" value="false"/>
+ <Property name="contentAreaFilled" type="boolean"
value="false"/>
<Property name="maximumSize" type="java.awt.Dimension"
editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[24, 24]"/>
</Property>
@@ -121,6 +126,7 @@
<ResourceString
bundle="org/jdesktop/wonderland/modules/userlist/client/resources/Bundle.properties"
key="UserListHUDPanel.textChatButton.toolTipText"
replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
</Property>
<Property name="borderPainted" type="boolean" value="false"/>
+ <Property name="contentAreaFilled" type="boolean"
value="false"/>
<Property name="maximumSize" type="java.awt.Dimension"
editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[24, 24]"/>
</Property>
@@ -140,6 +146,7 @@
<Property name="toolTipText" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString
bundle="org/jdesktop/wonderland/modules/userlist/client/resources/Bundle.properties"
key="UserListHUDPanel.voiceChatButton.toolTipText"
replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
</Property>
+ <Property name="contentAreaFilled" type="boolean"
value="false"/>
<Property name="maximumSize" type="java.awt.Dimension"
editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[24, 24]"/>
</Property>
@@ -159,6 +166,7 @@
<Property name="toolTipText" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString
bundle="org/jdesktop/wonderland/modules/userlist/client/resources/Bundle.properties"
key="UserListHUDPanel.phoneButton.toolTipText"
replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
</Property>
+ <Property name="contentAreaFilled" type="boolean"
value="false"/>
<Property name="maximumSize" type="java.awt.Dimension"
editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[24, 24]"/>
</Property>
@@ -170,14 +178,15 @@
</Property>
</Properties>
</Component>
- <Component class="javax.swing.JButton" name="editButton">
+ <Component class="javax.swing.JButton" name="gotoUserButton">
<Properties>
<Property name="icon" type="javax.swing.Icon"
editor="org.netbeans.modules.form.editors2.IconEditor">
- <Image iconType="3"
name="/org/jdesktop/wonderland/modules/userlist/client/resources/UserListEdit24x24.png"/>
+ <Image iconType="3"
name="/org/jdesktop/wonderland/modules/userlist/client/resources/UserListGoto24x24.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString
bundle="org/jdesktop/wonderland/modules/userlist/client/resources/Bundle.properties"
key="UserListHUDPanel.editButton.toolTipText"
replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
+ <ResourceString
bundle="org/jdesktop/wonderland/modules/userlist/client/resources/Bundle.properties"
key="UserListHUDPanel.gotoUserButton.toolTipText"
replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
</Property>
+ <Property name="contentAreaFilled" type="boolean"
value="false"/>
<Property name="maximumSize" type="java.awt.Dimension"
editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[24, 24]"/>
</Property>
@@ -189,14 +198,15 @@
</Property>
</Properties>
</Component>
- <Component class="javax.swing.JButton" name="propertiesButton">
+ <Component class="javax.swing.JButton" name="editButton">
<Properties>
<Property name="icon" type="javax.swing.Icon"
editor="org.netbeans.modules.form.editors2.IconEditor">
- <Image iconType="3"
name="/org/jdesktop/wonderland/modules/userlist/client/resources/UserListProperties24x24.png"/>
+ <Image iconType="3"
name="/org/jdesktop/wonderland/modules/userlist/client/resources/UserListEdit24x24.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString
bundle="org/jdesktop/wonderland/modules/userlist/client/resources/Bundle.properties"
key="UserListHUDPanel.propertiesButton.toolTipText"
replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
+ <ResourceString
bundle="org/jdesktop/wonderland/modules/userlist/client/resources/Bundle.properties"
key="UserListHUDPanel.editButton.toolTipText"
replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
</Property>
+ <Property name="contentAreaFilled" type="boolean"
value="false"/>
<Property name="maximumSize" type="java.awt.Dimension"
editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[24, 24]"/>
</Property>
@@ -208,21 +218,15 @@
</Property>
</Properties>
</Component>
- <Component class="javax.swing.JLabel" name="volumeLabel">
- <Properties>
- <Property name="text" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString
bundle="org/jdesktop/wonderland/modules/userlist/client/resources/Bundle.properties"
key="UserListHUDPanel.volumeLabel.text"
replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
- </Property>
- </Properties>
- </Component>
- <Component class="javax.swing.JButton" name="gotoUserButton">
+ <Component class="javax.swing.JButton" name="propertiesButton">
<Properties>
<Property name="icon" type="javax.swing.Icon"
editor="org.netbeans.modules.form.editors2.IconEditor">
- <Image iconType="3"
name="/org/jdesktop/wonderland/modules/userlist/client/resources/UserListGoto24x24.png"/>
+ <Image iconType="3"
name="/org/jdesktop/wonderland/modules/userlist/client/resources/UserListProperties24x24.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString
bundle="org/jdesktop/wonderland/modules/userlist/client/resources/Bundle.properties"
key="UserListHUDPanel.gotoUserButton.toolTipText"
replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
+ <ResourceString
bundle="org/jdesktop/wonderland/modules/userlist/client/resources/Bundle.properties"
key="UserListHUDPanel.propertiesButton.toolTipText"
replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
</Property>
+ <Property name="contentAreaFilled" type="boolean"
value="false"/>
<Property name="maximumSize" type="java.awt.Dimension"
editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[24, 24]"/>
</Property>
@@ -234,12 +238,8 @@
</Property>
</Properties>
</Component>
- <Component class="javax.swing.JSlider" name="volumeSlider">
- <Properties>
- <Property name="minorTickSpacing" type="int" value="10"/>
- <Property name="paintTicks" type="boolean" value="true"/>
- </Properties>
- </Component>
+ </SubComponents>
+ </Container>
</SubComponents>
</Container>
<Container class="javax.swing.JScrollPane" name="userListScrollPane">
=======================================
---
/trunk/modules/tools/user-list/src/classes/org/jdesktop/wonderland/modules/userlist/client/views/WonderlandUserListView.java
Mon Apr 30 14:51:31 2012
+++
/trunk/modules/tools/user-list/src/classes/org/jdesktop/wonderland/modules/userlist/client/views/WonderlandUserListView.java
Thu Jul 18 06:45:19 2013
@@ -308,93 +308,99 @@
private void initComponents() {

controlPanel = new javax.swing.JPanel();
+ volumeLabel = new javax.swing.JLabel();
+ volumeSlider = new javax.swing.JSlider();
+ jPanel2 = new javax.swing.JPanel();
muteButton = new javax.swing.JButton();
textChatButton = new javax.swing.JButton();
voiceChatButton = new javax.swing.JButton();
phoneButton = new javax.swing.JButton();
+ gotoUserButton = new javax.swing.JButton();
editButton = new javax.swing.JButton();
propertiesButton = new javax.swing.JButton();
- volumeLabel = new javax.swing.JLabel();
- gotoUserButton = new javax.swing.JButton();
- volumeSlider = new javax.swing.JSlider();
userListScrollPane = new javax.swing.JScrollPane();
userList = new javax.swing.JList();
jPanel1 = new javax.swing.JPanel();
panelToggleButton = new javax.swing.JButton();

- setPreferredSize(new java.awt.Dimension(194, 300));
+ setPreferredSize(new java.awt.Dimension(194, 310));

+ java.util.ResourceBundle bundle =
java.util.ResourceBundle.getBundle("org/jdesktop/wonderland/modules/userlist/client/resources/Bundle");
// NOI18N
+
volumeLabel.setText(bundle.getString("UserListHUDPanel.volumeLabel.text"));
// NOI18N
+
+ volumeSlider.setMinorTickSpacing(10);
+ volumeSlider.setPaintTicks(true);
+
+ jPanel2.setLayout(new java.awt.GridLayout());
+
+ muteButton.setBackground(new java.awt.Color(255, 255, 255));
+ muteButton.setForeground(new java.awt.Color(255, 255, 255));
muteButton.setIcon(new
javax.swing.ImageIcon(getClass().getResource("/org/jdesktop/wonderland/modules/userlist/client/resources/UserListMicMuteOff24x24.png")));
// NOI18N
- java.util.ResourceBundle bundle =
java.util.ResourceBundle.getBundle("org/jdesktop/wonderland/modules/userlist/client/resources/Bundle");
// NOI18N

muteButton.setToolTipText(bundle.getString("UserListHUDPanel.muteButton.toolTipText"));
// NOI18N
muteButton.setBorderPainted(false);
+ muteButton.setContentAreaFilled(false);
muteButton.setMaximumSize(new java.awt.Dimension(24, 24));
muteButton.setMinimumSize(new java.awt.Dimension(24, 24));
muteButton.setPreferredSize(new java.awt.Dimension(24, 24));
+ jPanel2.add(muteButton);

textChatButton.setIcon(new
javax.swing.ImageIcon(getClass().getResource("/org/jdesktop/wonderland/modules/userlist/client/resources/UserListChatText24x24.png")));
// NOI18N

textChatButton.setToolTipText(bundle.getString("UserListHUDPanel.textChatButton.toolTipText"));
// NOI18N
textChatButton.setBorderPainted(false);
+ textChatButton.setContentAreaFilled(false);
textChatButton.setMaximumSize(new java.awt.Dimension(24, 24));
textChatButton.setMinimumSize(new java.awt.Dimension(24, 24));
textChatButton.setPreferredSize(new java.awt.Dimension(24, 24));
+ jPanel2.add(textChatButton);

voiceChatButton.setIcon(new
javax.swing.ImageIcon(getClass().getResource("/org/jdesktop/wonderland/modules/userlist/client/resources/UserListChatVoice24x24.png")));
// NOI18N

voiceChatButton.setToolTipText(bundle.getString("UserListHUDPanel.voiceChatButton.toolTipText"));
// NOI18N
+ voiceChatButton.setContentAreaFilled(false);
voiceChatButton.setMaximumSize(new java.awt.Dimension(24, 24));
voiceChatButton.setMinimumSize(new java.awt.Dimension(24, 24));
voiceChatButton.setPreferredSize(new java.awt.Dimension(24, 24));
+ jPanel2.add(voiceChatButton);

phoneButton.setIcon(new
javax.swing.ImageIcon(getClass().getResource("/org/jdesktop/wonderland/modules/userlist/client/resources/UserListPhone24x24.png")));
// NOI18N

phoneButton.setToolTipText(bundle.getString("UserListHUDPanel.phoneButton.toolTipText"));
// NOI18N
+ phoneButton.setContentAreaFilled(false);
phoneButton.setMaximumSize(new java.awt.Dimension(24, 24));
phoneButton.setMinimumSize(new java.awt.Dimension(24, 24));
phoneButton.setPreferredSize(new java.awt.Dimension(24, 24));
+ jPanel2.add(phoneButton);
+
+ gotoUserButton.setIcon(new
javax.swing.ImageIcon(getClass().getResource("/org/jdesktop/wonderland/modules/userlist/client/resources/UserListGoto24x24.png")));
// NOI18N
+
gotoUserButton.setToolTipText(bundle.getString("UserListHUDPanel.gotoUserButton.toolTipText"));
// NOI18N
+ gotoUserButton.setContentAreaFilled(false);
+ gotoUserButton.setMaximumSize(new java.awt.Dimension(24, 24));
+ gotoUserButton.setMinimumSize(new java.awt.Dimension(24, 24));
+ gotoUserButton.setPreferredSize(new java.awt.Dimension(24, 24));
+ jPanel2.add(gotoUserButton);

editButton.setIcon(new
javax.swing.ImageIcon(getClass().getResource("/org/jdesktop/wonderland/modules/userlist/client/resources/UserListEdit24x24.png")));
// NOI18N

editButton.setToolTipText(bundle.getString("UserListHUDPanel.editButton.toolTipText"));
// NOI18N
+ editButton.setContentAreaFilled(false);
editButton.setMaximumSize(new java.awt.Dimension(24, 24));
editButton.setMinimumSize(new java.awt.Dimension(24, 24));
editButton.setPreferredSize(new java.awt.Dimension(24, 24));
+ jPanel2.add(editButton);

propertiesButton.setIcon(new
javax.swing.ImageIcon(getClass().getResource("/org/jdesktop/wonderland/modules/userlist/client/resources/UserListProperties24x24.png")));
// NOI18N

propertiesButton.setToolTipText(bundle.getString("UserListHUDPanel.propertiesButton.toolTipText"));
// NOI18N
+ propertiesButton.setContentAreaFilled(false);
propertiesButton.setMaximumSize(new java.awt.Dimension(24, 24));
propertiesButton.setMinimumSize(new java.awt.Dimension(24, 24));
propertiesButton.setPreferredSize(new java.awt.Dimension(24, 24));
-
-
volumeLabel.setText(bundle.getString("UserListHUDPanel.volumeLabel.text"));
// NOI18N
-
- gotoUserButton.setIcon(new
javax.swing.ImageIcon(getClass().getResource("/org/jdesktop/wonderland/modules/userlist/client/resources/UserListGoto24x24.png")));
// NOI18N
-
gotoUserButton.setToolTipText(bundle.getString("UserListHUDPanel.gotoUserButton.toolTipText"));
// NOI18N
- gotoUserButton.setMaximumSize(new java.awt.Dimension(24, 24));
- gotoUserButton.setMinimumSize(new java.awt.Dimension(24, 24));
- gotoUserButton.setPreferredSize(new java.awt.Dimension(24, 24));
-
- volumeSlider.setMinorTickSpacing(10);
- volumeSlider.setPaintTicks(true);
+ jPanel2.add(propertiesButton);

org.jdesktop.layout.GroupLayout controlPanelLayout = new
org.jdesktop.layout.GroupLayout(controlPanel);
controlPanel.setLayout(controlPanelLayout);
controlPanelLayout.setHorizontalGroup(

controlPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(jPanel2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.add(controlPanelLayout.createSequentialGroup()
.addContainerGap()
.add(controlPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(controlPanelLayout.createSequentialGroup()
- .add(muteButton,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(3, 3, 3)
- .add(textChatButton,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(3, 3, 3)
- .add(voiceChatButton,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(3, 3, 3)
- .add(phoneButton,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(3, 3, 3)
- .add(gotoUserButton,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(3, 3, 3)
- .add(editButton,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(2, 2, 2)
- .add(propertiesButton,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
.add(volumeLabel,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
.add(volumeSlider,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE))
.addContainerGap())
@@ -402,19 +408,12 @@
controlPanelLayout.setVerticalGroup(

controlPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(controlPanelLayout.createSequentialGroup()
- .add(controlPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(propertiesButton,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(textChatButton,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(muteButton,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(voiceChatButton,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(phoneButton,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(gotoUserButton,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(editButton,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(jPanel2,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(volumeLabel)
- .add(0, 0, 0)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(volumeSlider,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 23,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(0, 0, 0))
+ .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
Short.MAX_VALUE))
);

userListScrollPane.setPreferredSize(new java.awt.Dimension(260,
300));
@@ -447,16 +446,16 @@
this.setLayout(layout);
layout.setHorizontalGroup(

layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(userListScrollPane,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 197,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(userListScrollPane,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 197, Short.MAX_VALUE)
.add(controlPanel,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.add(jPanel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
197, Short.MAX_VALUE)
);
layout.setVerticalGroup(

layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(org.jdesktop.layout.GroupLayout.TRAILING,
layout.createSequentialGroup()
- .add(userListScrollPane,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 205, Short.MAX_VALUE)
+ .add(userListScrollPane,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 186, Short.MAX_VALUE)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(controlPanel,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(controlPanel,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(jPanel1,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
);
@@ -467,6 +466,7 @@
private javax.swing.JButton editButton;
private javax.swing.JButton gotoUserButton;
private javax.swing.JPanel jPanel1;
+ private javax.swing.JPanel jPanel2;
private javax.swing.JButton muteButton;
private javax.swing.JButton panelToggleButton;
private javax.swing.JButton phoneButton;
=======================================
--- /trunk/modules/tools/xapps-config/build.xml Mon Jan 25 11:19:57 2010
+++ /trunk/modules/tools/xapps-config/build.xml Thu Jul 18 06:45:19 2013
@@ -73,6 +73,9 @@
<clientjar name="xapps-config-client"
basedir="${build.classes.dir}">
<include name="${module.src}/client/**"/>
<include name="${module.src}/common/**"/>
+ <fileset dir="${current.dir}/src/classes">
+ <include
name="${module.src}/client/resources/**/*.png"/>
+ </fileset>
</clientjar>
</client>

=======================================
---
/trunk/modules/tools/xapps-config/src/classes/org/jdesktop/wonderland/modules/xappsconfig/client/XAppCellFactory.java
Wed Aug 5 12:24:11 2009
+++
/trunk/modules/tools/xapps-config/src/classes/org/jdesktop/wonderland/modules/xappsconfig/client/XAppCellFactory.java
Thu Jul 18 06:45:19 2013
@@ -25,6 +25,8 @@
import org.jdesktop.wonderland.common.cell.state.BoundingVolumeHint;
import com.jme.bounding.BoundingBox;
import com.jme.math.Vector3f;
+import java.awt.Toolkit;
+import java.net.URL;
import java.util.logging.Logger;

/**
@@ -107,7 +109,8 @@
*/
public Image getPreviewImage() {
// TODO
- return null;
+ URL url =
XAppCellFactory.class.getResource("resources/X11-icon.png");
+ return Toolkit.getDefaultToolkit().getImage(url);
}

/**
=======================================
--- /trunk/modules/world/avatarbase/lib/avatars.jar Mon Apr 30 14:47:32 2012
+++ /trunk/modules/world/avatarbase/lib/avatars.jar Thu Jul 18 06:45:19 2013
File is too large to display a diff.
=======================================
---
/trunk/modules/world/avatarbase/src/classes/org/jdesktop/wonderland/modules/avatarbase/client/jme/cellrenderer/AvatarImiJME.java
Thu May 31 09:45:11 2012
+++
/trunk/modules/world/avatarbase/src/classes/org/jdesktop/wonderland/modules/avatarbase/client/jme/cellrenderer/AvatarImiJME.java
Thu Jul 18 06:45:19 2013
@@ -403,6 +403,7 @@
*/
private void changeAvatarInternal(WlAvatarCharacter newAvatar) {

+ int flg=0;
if (newAvatar==null)
return;

@@ -423,6 +424,7 @@

avatarCharacter.getJScene().getExternalKidsRoot().detachChild(nameTagNode);
selectForInput(false);
avatarCharacter.destroy();
+ flg=1;
}

// Set the new avatar character. If there is none (when would that
happen?)
@@ -493,6 +495,18 @@

// Turn off the indication that we have finished loading
LoadingInfo.finishedLoading(cell.getCellID(), newAvatar.getName());
+
+ //--added for sitting problem when user logs in--//
+ //check If there is an existing avatar character
+ if(flg==0) {
+ AvatarCell acell = (AvatarCell) cell;
+ MovableAvatarComponent mac = (MovableAvatarComponent)
acell.getComponent(MovableComponent.class);
+ //check if avatar has trigger value of sitting
+ if(mac.getServerTrigger()==15) {
+
avatarCharacter.getContext().triggerPressed(mac.getServerTrigger());
+ }
+ }
+ //--added for sitting problem when user logs in--//
}

public boolean isPickable() {
Reply all
Reply to author
Forward
0 new messages