Commit e776c788 authored by Khoirunnisa Afifah's avatar Khoirunnisa Afifah
Browse files

edit GUI

parent 4f13966c
......@@ -25,72 +25,70 @@
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="33" max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Component id="honeyLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="79" pref="79" max="-2" attributes="0"/>
<Component id="HoneyCount" min="-2" pref="10" max="-2" attributes="0"/>
</Group>
<Component id="Honey" min="-2" pref="117" max="-2" attributes="0"/>
<Group type="103" alignment="1" groupAlignment="0" max="-2" attributes="0">
<Group type="102" attributes="0">
<Component id="incenseLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="HoneyCount5" min="-2" pref="10" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="35" max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0">
<Component id="Honey" min="-2" pref="117" max="-2" attributes="0"/>
<Component id="Incense" alignment="1" min="-2" pref="118" max="-2" attributes="0"/>
<Group type="102" alignment="1" attributes="0">
<Component id="incenseLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="40" max="-2" attributes="0"/>
</Group>
</Group>
<Component id="Incense" min="-2" pref="118" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="1" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="honeyLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="58" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Group type="102" attributes="0">
<Component id="gemsLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="HoneyCount6" min="-2" pref="10" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Component id="herbsLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="HoneyCount1" min="-2" pref="10" max="-2" attributes="0"/>
</Group>
<Component id="Gems" pref="0" max="32767" attributes="0"/>
<Component id="Herbs" min="-2" pref="109" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="40" max="-2" attributes="0"/>
<Component id="herbsLabel" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="39" max="-2" attributes="0"/>
<Component id="gemsLabel" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace min="-2" pref="27" max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" max="-2" attributes="0">
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Group type="102" attributes="0">
<Component id="lifeElixirLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="HoneyCount7" min="-2" pref="10" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="27" max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0">
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="Clay" min="-2" pref="111" max="-2" attributes="0"/>
<Component id="LifeElixir" min="-2" pref="111" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="1" attributes="0">
<Component id="clayLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="39" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Component id="clayLabel" min="-2" max="-2" attributes="0"/>
<Group type="102" alignment="1" attributes="0">
<EmptySpace max="32767" attributes="0"/>
<Component id="HoneyCount2" min="-2" pref="10" max="-2" attributes="0"/>
</Group>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="Clay" min="-2" pref="111" max="-2" attributes="0"/>
<Component id="LifeElixir" min="-2" pref="111" max="-2" attributes="0"/>
<Component id="lifeElixirLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="63" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="Mineral" alignment="0" min="-2" pref="113" max="-2" attributes="0"/>
<Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0">
<Group type="102" attributes="0">
<Component id="manaCrystalLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="HoneyCount8" min="-2" pref="10" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Component id="mineralLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="HoneyCount3" min="-2" pref="10" max="-2" attributes="0"/>
</Group>
<Component id="ManaCrystal" alignment="0" min="-2" pref="111" max="-2" attributes="0"/>
<Component id="ManaCrystal" alignment="0" min="-2" pref="111" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="45" max="-2" attributes="0"/>
<Component id="mineralLabel" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
<Component id="manaCrystalLabel" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</Group>
......@@ -102,23 +100,19 @@
<EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="findButton" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="Potion" min="-2" pref="103" max="-2" attributes="0"/>
<Component id="PilosopherStone" min="-2" pref="103" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Component id="potionLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="HoneyCount4" min="-2" pref="10" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Component id="philosopherStoneLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="HoneyCount9" min="-2" pref="10" max="-2" attributes="0"/>
</Group>
</Group>
<Component id="Potion" min="-2" pref="103" max="-2" attributes="0"/>
<Component id="PilosopherStone" min="-2" pref="103" max="-2" attributes="0"/>
<Component id="backButton" min="-2" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="42" max="-2" attributes="0"/>
<Component id="potionLabel" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<EmptySpace min="10" pref="10" max="-2" attributes="0"/>
<Component id="philosopherStoneLabel" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace pref="40" max="32767" attributes="0"/>
<EmptySpace pref="42" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
......@@ -134,19 +128,12 @@
<Component id="Potion" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="honeyLabel" min="-2" max="-2" attributes="0"/>
<Component id="HoneyCount" min="-2" max="-2" attributes="0"/>
<Group type="103" alignment="0" groupAlignment="3" attributes="0">
<Component id="herbsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="HoneyCount1" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="clayLabel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="HoneyCount2" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="mineralLabel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="HoneyCount3" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="potionLabel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="HoneyCount4" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="herbsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="clayLabel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="mineralLabel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="potionLabel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="honeyLabel" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="-2" pref="27" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
......@@ -159,17 +146,12 @@
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="incenseLabel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="HoneyCount5" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="gemsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="HoneyCount6" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="lifeElixirLabel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="HoneyCount7" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="manaCrystalLabel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="HoneyCount8" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="philosopherStoneLabel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="HoneyCount9" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace pref="44" max="32767" attributes="0"/>
<EmptySpace pref="43" max="32767" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="selectedItem" min="-2" max="-2" attributes="0"/>
<Group type="102" attributes="0">
......@@ -303,101 +285,51 @@
<Property name="text" type="java.lang.String" value="Honey"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="HoneyCount">
<Properties>
<Property name="text" type="java.lang.String" value="0"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="herbsLabel">
<Properties>
<Property name="text" type="java.lang.String" value="Herbs"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="HoneyCount1">
<Properties>
<Property name="text" type="java.lang.String" value="0"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="clayLabel">
<Properties>
<Property name="text" type="java.lang.String" value="Clay"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="HoneyCount2">
<Properties>
<Property name="text" type="java.lang.String" value="0"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="mineralLabel">
<Properties>
<Property name="text" type="java.lang.String" value="Mineral"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="HoneyCount3">
<Properties>
<Property name="text" type="java.lang.String" value="0"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="potionLabel">
<Properties>
<Property name="text" type="java.lang.String" value="Potion"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="HoneyCount4">
<Properties>
<Property name="text" type="java.lang.String" value="0"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="incenseLabel">
<Properties>
<Property name="text" type="java.lang.String" value="Incense"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="HoneyCount5">
<Properties>
<Property name="text" type="java.lang.String" value="0"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="gemsLabel">
<Properties>
<Property name="text" type="java.lang.String" value="Gems"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="HoneyCount6">
<Properties>
<Property name="text" type="java.lang.String" value="0"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="lifeElixirLabel">
<Properties>
<Property name="text" type="java.lang.String" value="Life Elixir"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="HoneyCount7">
<Properties>
<Property name="text" type="java.lang.String" value="0"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="manaCrystalLabel">
<Properties>
<Property name="text" type="java.lang.String" value="Mana Crystal"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="HoneyCount8">
<Properties>
<Property name="text" type="java.lang.String" value="0"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="philosopherStoneLabel">
<Properties>
<Property name="text" type="java.lang.String" value="Philosopher Stone "/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="HoneyCount9">
<Properties>
<Property name="text" type="java.lang.String" value="0"/>
</Properties>
</Component>
<Component class="javax.swing.JButton" name="findButton">
<Properties>
<Property name="text" type="java.lang.String" value="Find"/>
......
This diff is collapsed.
......@@ -39,31 +39,28 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="223" max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0">
<Component id="loginButton" min="-2" max="-2" attributes="0"/>
<Group type="102" alignment="1" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="usernameLabel" min="-2" max="-2" attributes="0"/>
<Component id="passwordLabel" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="-2" pref="48" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="usernameForm" pref="194" max="32767" attributes="0"/>
<Component id="passwordForm" max="32767" attributes="0"/>
</Group>
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
<Component id="jLabel2" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<Group type="103" alignment="0" groupAlignment="1" attributes="0">
<Component id="loginButton" min="-2" max="-2" attributes="0"/>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="usernameLabel" min="-2" max="-2" attributes="0"/>
<Component id="passwordLabel" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
<Component id="jLabel2" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="-2" pref="48" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="usernameForm" pref="194" max="32767" attributes="0"/>
<Component id="passwordForm" max="32767" attributes="0"/>
</Group>
</Group>
<EmptySpace min="-2" pref="111" max="-2" attributes="0"/>
</Group>
</Group>
</Group>
......@@ -72,7 +69,7 @@
<Component id="jLabel3" min="-2" pref="273" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace pref="96" max="32767" attributes="0"/>
<EmptySpace pref="170" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
......@@ -100,9 +97,9 @@
<Component id="passwordForm" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="passwordLabel" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="-2" pref="42" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="39" max="-2" attributes="0"/>
<Component id="loginButton" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="21" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jButton1" alignment="3" min="-2" max="-2" attributes="0"/>
......
......@@ -118,29 +118,27 @@ public class LoginPanel extends javax.swing.JPanel {
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addGap(223, 223, 223)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(loginButton)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addComponent(jLabel1)
.addGap(18, 18, 18)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(usernameLabel)
.addComponent(passwordLabel))
.addGap(48, 48, 48)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(usernameForm, javax.swing.GroupLayout.DEFAULT_SIZE, 194, Short.MAX_VALUE)
.addComponent(passwordForm)))
.addGroup(layout.createSequentialGroup()
.addComponent(jLabel1)
.addGap(18, 18, 18)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jButton1)
.addComponent(jLabel2))))
.addGap(111, 111, 111))))
.addComponent(jButton1)
.addComponent(jLabel2)))
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(loginButton)
.addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(usernameLabel)
.addComponent(passwordLabel))
.addGap(48, 48, 48)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(usernameForm, javax.swing.GroupLayout.DEFAULT_SIZE, 194, Short.MAX_VALUE)
.addComponent(passwordForm))))))
.addGroup(layout.createSequentialGroup()
.addGap(277, 277, 277)
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 273, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addContainerGap(96, Short.MAX_VALUE))
.addContainerGap(170, Short.MAX_VALUE))
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
......@@ -163,9 +161,9 @@ public class LoginPanel extends javax.swing.JPanel {
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(passwordForm, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(passwordLabel))
.addGap(42, 42, 42)
.addGap(39, 39, 39)
.addComponent(loginButton)
.addGap(18, 18, 18)
.addGap(21, 21, 21)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel1)
.addComponent(jButton1))
......
......@@ -41,7 +41,7 @@
<Component id="MapName" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<Component id="jButton5" alignment="1" min="-2" pref="96" max="-2" attributes="0"/>
<Component id="findItemButon" alignment="1" min="-2" pref="96" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jLabel4" alignment="0" min="-2" max="-2" attributes="0"/>
......@@ -49,7 +49,7 @@
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="Status" min="-2" max="-2" attributes="0"/>
<Component id="statusLabel" min="-2" max="-2" attributes="0"/>
<Component id="Current" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
......@@ -58,11 +58,11 @@
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="-2" pref="141" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jButton3" alignment="1" min="-2" pref="96" max="-2" attributes="0"/>
<Component id="jButton4" alignment="1" min="-2" pref="96" max="-2" attributes="0"/>
<Component id="jButton1" alignment="1" min="-2" pref="96" max="-2" attributes="0"/>
<Component id="jButton6" alignment="1" min="-2" pref="96" max="-2" attributes="0"/>
<Component id="jButton2" alignment="1" min="-2" pref="96" max="-2" attributes="0"/>
<Component id="tradeButton" alignment="1" min="-2" pref="96" max="-2" attributes="0"/>
<Component id="offerButton" alignment="1" min="-2" pref="96" max="-2" attributes="0"/>
<Component id="inventoryButton" alignment="1" min="-2" pref="96" max="-2" attributes="0"/>
<Component id="logoutButton" alignment="1" min="-2" pref="96" max="-2" attributes="0"/>
<Component id="mixItemButton" alignment="1" min="-2" pref="96" max="-2" attributes="0"/>
<Component id="getItemButton" alignment="1" min="-2" pref="96" max="-2" attributes="0"/>
</Group>
</Group>
......@@ -99,22 +99,22 @@
<EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel5" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="Status" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="statusLabel" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="getItemButton" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
<Component id="inventoryButton" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="jButton2" min="-2" max="-2" attributes="0"/>
<Component id="mixItemButton" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="25" max="-2" attributes="0"/>
<Component id="jButton3" min="-2" max="-2" attributes="0"/>
<Component id="tradeButton" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="jButton4" min="-2" max="-2" attributes="0"/>
<Component id="offerButton" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="jButton5" min="-2" max="-2" attributes="0"/>
<Component id="findItemButon" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="jButton6" min="-2" max="-2" attributes="0"/>
<Component id="logoutButton" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="map" min="-2" max="-2" attributes="0"/>
</Group>
......@@ -230,52 +230,52 @@
<Property name="text" type="java.lang.String" value="Current Time"/>
</Properties>
</Component>
<Component class="javax.swing.JButton" name="jButton1">
<Component class="javax.swing.JButton" name="inventoryButton">
<Properties>
<Property name="text" type="java.lang.String" value="Inventory"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="inventoryButtonActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JButton" name="jButton2">
<Component class="javax.swing.JButton" name="mixItemButton">
<Properties>
<Property name="text" type="java.lang.String" value="Mix Item"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton2ActionPerformed"/>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="mixItemButtonActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JButton" name="jButton3">
<Component class="javax.swing.JButton" name="tradeButton">
<Properties>
<Property name="text" type="java.lang.String" value="Trade Box"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton3ActionPerformed"/>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="tradeButtonActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JButton" name="jButton4">
<Component class="javax.swing.JButton" name="offerButton">
<Properties>
<Property name="text" type="java.lang.String" value="Offer"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton4ActionPerformed"/>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="offerButtonActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JButton" name="jButton5">
<Component class="javax.swing.JButton" name="findItemButon">
<Properties>
<Property name="text" type="java.lang.String" value="Find Item"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton5ActionPerformed"/>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="findItemButonActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JButton" name="jButton6">
<Component class="javax.swing.JButton" name="logoutButton">
<Properties>
<Property name="text" type="java.lang.String" value="Logout"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton6ActionPerformed"/>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="logoutButtonActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JLabel" name="jLabel5">
......@@ -286,7 +286,7 @@
<Property name="text" type="java.lang.String" value="Status:"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="Status">
<Component class="javax.swing.JLabel" name="statusLabel">
<Properties>
<Property name="text" type="java.lang.String" value="Status"/>
</Properties>
......
......@@ -121,7 +121,7 @@ public class MapPanel extends javax.swing.JPanel {
desiredY = y;
moveTime = Long.valueOf(Request.findInResponses("time"))*1000;