Commit 636f796b authored by Akhmad Fakhoni Listiyan Dede's avatar Akhmad Fakhoni Listiyan Dede
Browse files

Merging conflict

parents af3af3f1 1deea4c7
......@@ -54,43 +54,7 @@ is divided into following sections:
<property file="nbproject/project.properties"/>
</target>
<target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
<j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/>
<j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/>
<j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/>
<j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/>
<condition property="platform.javac" value="${platform.home}/bin/javac">
<equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/>
</condition>
<property name="platform.javac" value="${platform.javac.tmp}"/>
<j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/>
<condition property="platform.java" value="${platform.home}/bin/java">
<equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/>
</condition>
<property name="platform.java" value="${platform.java.tmp}"/>
<j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/>
<condition property="platform.javadoc" value="${platform.home}/bin/javadoc">
<equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/>
</condition>
<property name="platform.javadoc" value="${platform.javadoc.tmp}"/>
<condition property="platform.invalid" value="true">
<or>
<contains string="${platform.javac}" substring="$${platforms."/>
<contains string="${platform.java}" substring="$${platforms."/>
<contains string="${platform.javadoc}" substring="$${platforms."/>
</or>
</condition>
<fail unless="platform.home">Must set platform.home</fail>
<fail unless="platform.bootcp">Must set platform.bootcp</fail>
<fail unless="platform.java">Must set platform.java</fail>
<fail unless="platform.javac">Must set platform.javac</fail>
<fail if="platform.invalid">
The J2SE Platform is not correctly set up.
Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files.
Either open the project in the IDE and setup the Platform with the same name or add it manually.
For example like this:
ant -Duser.properties.file=&lt;path_to_property_file&gt; jar (where you put the property "platforms.${platform.active}.home" in a .properties file)
or ant -Dplatforms.${platform.active}.home=&lt;path_to_JDK_home&gt; jar (where no properties file is used)
</fail>
<property name="platform.java" value="${java.home}/bin/java"/>
<available file="${manifest.file}" property="manifest.available"/>
<condition property="splashscreen.available">
<and>
......@@ -219,6 +183,15 @@ is divided into following sections:
<condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
<isset property="profile.available"/>
</condition>
<condition else="false" property="jdkBug6558476">
<and>
<matches pattern="1\.[56]" string="${java.specification.version}"/>
<not>
<os family="unix"/>
</not>
</and>
</condition>
<property name="javac.fork" value="${jdkBug6558476}"/>
<property name="jar.index" value="false"/>
<property name="jar.index.metainf" value="${jar.index}"/>
<property name="copylibs.rebase" value="true"/>
......@@ -287,7 +260,7 @@ is divided into following sections:
<property location="${build.dir}/empty" name="empty.dir"/>
<mkdir dir="${empty.dir}"/>
<mkdir dir="@{apgeneratedsrcdir}"/>
<javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
<javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
<src>
<dirset dir="@{gensrcdir}" erroronmissingdir="false">
<include name="*"/>
......@@ -327,7 +300,7 @@ is divided into following sections:
<sequential>
<property location="${build.dir}/empty" name="empty.dir"/>
<mkdir dir="${empty.dir}"/>
<javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
<javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
<src>
<dirset dir="@{gensrcdir}" erroronmissingdir="false">
<include name="*"/>
......@@ -408,7 +381,7 @@ is divided into following sections:
<element name="customize" optional="true"/>
<sequential>
<property name="junit.forkmode" value="perTest"/>
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
<test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
<syspropertyset>
<propertyref prefix="test-sys-prop."/>
......@@ -431,7 +404,7 @@ is divided into following sections:
<element name="customize" optional="true"/>
<sequential>
<property name="junit.forkmode" value="perTest"/>
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
<batchtest todir="${build.test.results.dir}">
<fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
......@@ -470,7 +443,7 @@ is divided into following sections:
</fileset>
</union>
<taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
<testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="GrandQuest" testname="TestNG tests" workingDir="${work.dir}">
<testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="GrandQuest" testname="TestNG tests" workingDir="${work.dir}">
<xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
<propertyset>
<propertyref prefix="test-sys-prop."/>
......@@ -550,7 +523,7 @@ is divided into following sections:
<element name="customize" optional="true"/>
<sequential>
<property name="junit.forkmode" value="perTest"/>
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
<test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
<syspropertyset>
<propertyref prefix="test-sys-prop."/>
......@@ -575,7 +548,7 @@ is divided into following sections:
<element name="customize" optional="true"/>
<sequential>
<property name="junit.forkmode" value="perTest"/>
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
<batchtest todir="${build.test.results.dir}">
<fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
......@@ -755,9 +728,6 @@ is divided into following sections:
<classpath>
<path path="@{classpath}"/>
</classpath>
<bootclasspath>
<path path="${platform.bootcp}"/>
</bootclasspath>
</nbjpdastart>
</sequential>
</macrodef>
......@@ -773,9 +743,7 @@ is divided into following sections:
</macrodef>
</target>
<target name="-init-debug-args">
<exec executable="${platform.java}" outputproperty="version-output">
<arg value="-version"/>
</exec>
<property name="version-output" value="java version &quot;${ant.java.version}"/>
<condition property="have-jdk-older-than-1.4">
<or>
<contains string="${version-output}" substring="java version &quot;1.0"/>
......@@ -800,7 +768,7 @@ is divided into following sections:
<attribute default="${debug.classpath}" name="classpath"/>
<element name="customize" optional="true"/>
<sequential>
<java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">
<java classname="@{classname}" dir="${work.dir}" fork="true">
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
<jvmarg line="${debug-args-line}"/>
<jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
......@@ -827,7 +795,7 @@ is divided into following sections:
<attribute default="jvm" name="jvm"/>
<element name="customize" optional="true"/>
<sequential>
<java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">
<java classname="@{classname}" dir="${work.dir}" fork="true">
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
<jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
<redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
......@@ -1025,7 +993,7 @@ is divided into following sections:
<j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
<echo level="info">To run this application from the command line without Ant, try:</echo>
<property location="${dist.jar}" name="dist.jar.resolved"/>
<echo level="info">${platform.java} -jar "${dist.jar.resolved}"</echo>
<echo level="info">java -jar "${dist.jar.resolved}"</echo>
</target>
<target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
<j2seproject1:jar manifest="${tmp.manifest.file}"/>
......@@ -1234,13 +1202,10 @@ is divided into following sections:
</not>
</and>
</condition>
<exec executable="${platform.java}" failonerror="false" outputproperty="platform.version.output">
<arg value="-version"/>
</exec>
<condition else="" property="bug5101868workaround" value="*.java">
<matches multiline="true" pattern="1\.[56](\..*)?" string="${platform.version.output}"/>
<matches pattern="1\.[56](\..*)?" string="${java.version}"/>
</condition>
<javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" executable="${platform.javadoc}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
<javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
<classpath>
<path path="${javac.classpath}"/>
</classpath>
......
build.xml.data.CRC32=3a232f49
build.xml.data.CRC32=46045500
build.xml.script.CRC32=d6a6600c
build.xml.stylesheet.CRC32=8064a381@1.74.1.48
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=3a232f49
nbproject/build-impl.xml.script.CRC32=0d1f4ad7
nbproject/build-impl.xml.data.CRC32=46045500
nbproject/build-impl.xml.script.CRC32=41a00fd2
nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.1.48
......@@ -3,6 +3,21 @@
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group>
<<<<<<< HEAD
<file>file:/E:/OneDrive/Data%20Semester%206/Sistem%20Terdistribusi/GrandQuest/src/client/src/GUI/TradePanel.java</file>
<file>file:/E:/OneDrive/Data%20Semester%206/Sistem%20Terdistribusi/GrandQuest/src/client/src/grandquest/GrandQuest.java</file>
<file>file:/E:/OneDrive/Data%20Semester%206/Sistem%20Terdistribusi/GrandQuest/src/client/src/GUI/FindPanel.java</file>
<file>file:/E:/OneDrive/Data%20Semester%206/Sistem%20Terdistribusi/GrandQuest/src/client/src/GUI/LoginPanel.java</file>
<file>file:/E:/OneDrive/Data%20Semester%206/Sistem%20Terdistribusi/GrandQuest/src/client/src/GUI/MixItemPanel.java</file>
<file>file:/E:/OneDrive/Data%20Semester%206/Sistem%20Terdistribusi/GrandQuest/src/client/src/Request/Request.java</file>
<file>file:/E:/OneDrive/Data%20Semester%206/Sistem%20Terdistribusi/GrandQuest/src/client/src/GUI/MapPanel.java</file>
<file>file:/E:/OneDrive/Data%20Semester%206/Sistem%20Terdistribusi/GrandQuest/src/client/src/GUI/MainFrame.java</file>
<file>file:/E:/OneDrive/Data%20Semester%206/Sistem%20Terdistribusi/GrandQuest/src/client/src/GUI/InventoryPanel.java</file>
<file>file:/E:/OneDrive/Data%20Semester%206/Sistem%20Terdistribusi/GrandQuest/src/client/src/HelperClasses/Server.java</file>
<file>file:/E:/OneDrive/Data%20Semester%206/Sistem%20Terdistribusi/GrandQuest/src/client/src/HelperClasses/ButtonColumn.java</file>
<file>file:/E:/OneDrive/Data%20Semester%206/Sistem%20Terdistribusi/GrandQuest/src/client/src/GUI/OfferingPanel.java</file>
<file>file:/E:/OneDrive/Data%20Semester%206/Sistem%20Terdistribusi/GrandQuest/src/client/src/GUI/MixedItem.java</file>
=======
<file>file:/D:/AFIK/Project/GrandQuest%20Sister/IF3230-Tugas-Besar-Sister-2015/src/client/src/GUI/AcceptPanel.java</file>
<file>file:/D:/AFIK/Project/GrandQuest%20Sister/IF3230-Tugas-Besar-Sister-2015/src/client/src/GUI/MainFrame.java</file>
<file>file:/D:/AFIK/Project/GrandQuest%20Sister/IF3230-Tugas-Besar-Sister-2015/src/client/src/GUI/MixItemPanel.java</file>
......@@ -10,6 +25,7 @@
<file>file:/D:/AFIK/Project/GrandQuest%20Sister/IF3230-Tugas-Besar-Sister-2015/src/client/src/GUI/FindPanel.java</file>
<file>file:/D:/AFIK/Project/GrandQuest%20Sister/IF3230-Tugas-Besar-Sister-2015/src/client/src/GUI/LoginPanel.java</file>
<file>file:/D:/AFIK/Project/GrandQuest%20Sister/IF3230-Tugas-Besar-Sister-2015/src/client/src/GUI/InventoryPanel.java</file>
>>>>>>> 86d3b7e8f0f0920102862df169fb0ad151a60dc4
</group>
</open-files>
</project-private>
......@@ -66,7 +66,7 @@ main.class=grandquest.GrandQuest
manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=false
platform.active=JDK_1.8
platform.active=default_platform
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
......
......@@ -4,7 +4,6 @@
<configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>GrandQuest</name>
<explicit-platform explicit-source-supported="true"/>
<source-roots>
<root id="src.dir"/>
</source-roots>
......
......@@ -27,6 +27,8 @@ public class LoginPanel extends javax.swing.JPanel {
// GrandQuest.port = 8080;
GrandQuest.host = "167.205.32.46";
GrandQuest.port = 8025;
// GrandQuest.host = "localhost";
// GrandQuest.port = 8080;
// GrandQuest.host = "167.205.88.51";
// GrandQuest.port = 6789;
gq = new GrandQuest();
......
......@@ -529,8 +529,26 @@ public class MapPanel extends javax.swing.JPanel {
}//GEN-LAST:event_jButton4ActionPerformed
private void jButton3ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton3ActionPerformed
GrandQuest.savedPane = this;
gq.retTrade();
if(Request.connectToServer(GrandQuest.host,GrandQuest.port)){
String sentence = Request.tradeBox(GrandQuest.token).toString();
Request.responseHandler(Request.send(sentence));
}
if (Request.serverResponse!=null){
String res = Request.findInResponses("status");
switch(res){
case "ok" :
GrandQuest.offers = Request.findInResponses("offers");
System.out.println(GrandQuest.offers);
break;
default :
JOptionPane.showMessageDialog(null, "Error!", "Error", JOptionPane.ERROR_MESSAGE);
break;
}
GrandQuest.savedPane = this;
gq.retTrade();
}
}//GEN-LAST:event_jButton3ActionPerformed
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
......@@ -571,6 +589,7 @@ public class MapPanel extends javax.swing.JPanel {
private void jButton6ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton6ActionPerformed
int ret = JOptionPane.showConfirmDialog(null, "Are you sure want to quit to the main menu?","Confirmation",JOptionPane.YES_NO_OPTION);
if (ret==0){
Request.closeConnection();
t.stop();
gq.retLogIn();
}
......
......@@ -22,86 +22,91 @@
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace min="20" pref="20" max="-2" attributes="0"/>
<Component id="Item0" min="-2" max="-2" attributes="0"/>
<EmptySpace min="9" pref="9" max="-2" attributes="0"/>
<Component id="Item1" min="-2" max="-2" attributes="0"/>
<EmptySpace min="19" pref="19" max="-2" attributes="0"/>
<Component id="Item2" min="-2" max="-2" attributes="0"/>
<EmptySpace min="19" pref="19" max="-2" attributes="0"/>
<Component id="Item3" min="-2" max="-2" attributes="0"/>
<EmptySpace min="19" pref="19" max="-2" attributes="0"/>
<Component id="Item4" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<EmptySpace min="20" pref="20" max="-2" attributes="0"/>
<Component id="honeyLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="82" pref="82" max="-2" attributes="0"/>
<Component id="HoneyCount" min="-2" pref="17" max="-2" attributes="0"/>
<EmptySpace min="10" pref="10" max="-2" attributes="0"/>
<Component id="herbsLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="82" pref="82" max="-2" attributes="0"/>
<Component id="HerbsCount" min="-2" pref="17" max="-2" attributes="0"/>
<EmptySpace min="33" pref="33" max="-2" attributes="0"/>
<Component id="clayLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="79" pref="79" max="-2" attributes="0"/>
<Component id="ClayCount" min="-2" pref="17" max="-2" attributes="0"/>
<EmptySpace min="23" pref="23" max="-2" attributes="0"/>
<Component id="mineralLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="76" pref="76" max="-2" attributes="0"/>
<Component id="MineralCount" min="-2" pref="17" max="-2" attributes="0"/>
<EmptySpace min="23" pref="23" max="-2" attributes="0"/>
<Component id="potionLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="80" pref="80" max="-2" attributes="0"/>
<Component id="PotionCount" min="-2" pref="17" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<EmptySpace min="20" pref="20" max="-2" attributes="0"/>
<Component id="Item5" min="-2" max="-2" attributes="0"/>
<EmptySpace min="9" pref="9" max="-2" attributes="0"/>
<Component id="Item6" min="-2" max="-2" attributes="0"/>
<EmptySpace min="19" pref="19" max="-2" attributes="0"/>
<Component id="Item7" min="-2" max="-2" attributes="0"/>
<EmptySpace min="19" pref="19" max="-2" attributes="0"/>
<Component id="Item8" min="-2" max="-2" attributes="0"/>
<EmptySpace min="19" pref="19" max="-2" attributes="0"/>
<Component id="Item9" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<EmptySpace min="20" pref="20" max="-2" attributes="0"/>
<Component id="incenceLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="72" pref="72" max="-2" attributes="0"/>
<Component id="IncenseCount" min="-2" pref="17" max="-2" attributes="0"/>
<EmptySpace min="13" pref="13" max="-2" attributes="0"/>
<Component id="gemsLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="84" pref="84" max="-2" attributes="0"/>
<Component id="GemsCount" min="-2" pref="17" max="-2" attributes="0"/>
<EmptySpace min="23" pref="23" max="-2" attributes="0"/>
<Component id="lifeElixirLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="68" pref="68" max="-2" attributes="0"/>
<Component id="LifeElixirCount" min="-2" pref="17" max="-2" attributes="0"/>
<EmptySpace min="23" pref="23" max="-2" attributes="0"/>
<Component id="manaCrystalLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="57" pref="57" max="-2" attributes="0"/>
<Component id="ManaCrystalCount" min="-2" pref="17" max="-2" attributes="0"/>
<EmptySpace min="13" pref="13" max="-2" attributes="0"/>
<Component id="philosopherStoneLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="24" pref="24" max="-2" attributes="0"/>
<Component id="PilospherCount" min="-2" pref="17" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<EmptySpace min="130" pref="130" max="-2" attributes="0"/>
<Component id="FirstItem" min="-2" pref="130" max="-2" attributes="0"/>
<EmptySpace min="30" pref="30" max="-2" attributes="0"/>
<Component id="jLabel11" min="-2" max="-2" attributes="0"/>
<EmptySpace min="45" pref="45" max="-2" attributes="0"/>
<Component id="SecondItem" min="-2" pref="130" max="-2" attributes="0"/>
<EmptySpace min="130" pref="130" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jButton1" min="-2" pref="100" max="-2" attributes="0"/>
<Component id="jButton3" min="-2" pref="100" max="-2" attributes="0"/>
<Component id="jButton2" min="-2" pref="100" max="-2" attributes="0"/>
<Group type="102" attributes="0">
<EmptySpace min="20" pref="20" max="-2" attributes="0"/>
<Component id="Item0" min="-2" max="-2" attributes="0"/>
<EmptySpace min="9" pref="9" max="-2" attributes="0"/>
<Component id="Item1" min="-2" max="-2" attributes="0"/>
<EmptySpace min="19" pref="19" max="-2" attributes="0"/>
<Component id="Item2" min="-2" max="-2" attributes="0"/>
<EmptySpace min="19" pref="19" max="-2" attributes="0"/>
<Component id="Item3" min="-2" max="-2" attributes="0"/>
<EmptySpace min="19" pref="19" max="-2" attributes="0"/>
<Component id="Item4" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<EmptySpace min="20" pref="20" max="-2" attributes="0"/>
<Component id="honeyLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="82" pref="82" max="-2" attributes="0"/>
<Component id="HoneyCount" min="-2" pref="17" max="-2" attributes="0"/>
<EmptySpace min="10" pref="10" max="-2" attributes="0"/>
<Component id="herbsLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="82" pref="82" max="-2" attributes="0"/>
<Component id="HerbsCount" min="-2" pref="17" max="-2" attributes="0"/>
<EmptySpace min="33" pref="33" max="-2" attributes="0"/>
<Component id="clayLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="79" pref="79" max="-2" attributes="0"/>
<Component id="ClayCount" min="-2" pref="17" max="-2" attributes="0"/>
<EmptySpace min="23" pref="23" max="-2" attributes="0"/>
<Component id="mineralLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="76" pref="76" max="-2" attributes="0"/>
<Component id="MineralCount" min="-2" pref="17" max="-2" attributes="0"/>
<EmptySpace min="23" pref="23" max="-2" attributes="0"/>
<Component id="potionLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="80" pref="80" max="-2" attributes="0"/>
<Component id="PotionCount" min="-2" pref="17" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<EmptySpace min="20" pref="20" max="-2" attributes="0"/>
<Component id="Item5" min="-2" max="-2" attributes="0"/>
<EmptySpace min="9" pref="9" max="-2" attributes="0"/>
<Component id="Item6" min="-2" max="-2" attributes="0"/>
<EmptySpace min="19" pref="19" max="-2" attributes="0"/>
<Component id="Item7" min="-2" max="-2" attributes="0"/>
<EmptySpace min="19" pref="19" max="-2" attributes="0"/>
<Component id="Item8" min="-2" max="-2" attributes="0"/>
<EmptySpace min="19" pref="19" max="-2" attributes="0"/>
<Component id="Item9" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<EmptySpace min="20" pref="20" max="-2" attributes="0"/>
<Component id="incenceLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="72" pref="72" max="-2" attributes="0"/>
<Component id="IncenseCount" min="-2" pref="17" max="-2" attributes="0"/>
<EmptySpace min="13" pref="13" max="-2" attributes="0"/>
<Component id="gemsLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="84" pref="84" max="-2" attributes="0"/>
<Component id="GemsCount" min="-2" pref="17" max="-2" attributes="0"/>
<EmptySpace min="23" pref="23" max="-2" attributes="0"/>
<Component id="lifeElixirLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="68" pref="68" max="-2" attributes="0"/>
<Component id="LifeElixirCount" min="-2" pref="17" max="-2" attributes="0"/>
<EmptySpace min="23" pref="23" max="-2" attributes="0"/>
<Component id="manaCrystalLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="57" pref="57" max="-2" attributes="0"/>
<Component id="ManaCrystalCount" min="-2" pref="17" max="-2" attributes="0"/>
<EmptySpace min="13" pref="13" max="-2" attributes="0"/>
<Component id="philosopherStoneLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="24" pref="24" max="-2" attributes="0"/>
<Component id="PilospherCount" min="-2" pref="17" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<EmptySpace min="130" pref="130" max="-2" attributes="0"/>
<Component id="FirstItem" min="-2" pref="130" max="-2" attributes="0"/>
<EmptySpace min="30" pref="30" max="-2" attributes="0"/>
<Component id="jLabel11" min="-2" max="-2" attributes="0"/>
<EmptySpace min="45" pref="45" max="-2" attributes="0"/>
<Component id="SecondItem" min="-2" pref="130" max="-2" attributes="0"/>
<EmptySpace min="130" pref="130" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jButton1" min="-2" pref="100" max="-2" attributes="0"/>
<Component id="jButton3" min="-2" pref="100" max="-2" attributes="0"/>
<Component id="jButton2" min="-2" pref="100" max="-2" attributes="0"/>
</Group>
</Group>
</Group>
<EmptySpace pref="16" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
......
......@@ -269,81 +269,84 @@ public class MixItemPanel extends javax.swing.JPanel {
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addGap(20, 20, 20)
.addComponent(Item0)
.addGap(9, 9, 9)
.addComponent(Item1)
.addGap(19, 19, 19)
.addComponent(Item2)
.addGap(19, 19, 19)
.addComponent(Item3)
.addGap(19, 19, 19)
.addComponent(Item4))
.addGroup(layout.createSequentialGroup()
.addGap(20, 20, 20)
.addComponent(honeyLabel)
.addGap(82, 82, 82)
.addComponent(HoneyCount, javax.swing.GroupLayout.PREFERRED_SIZE, 17, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(10, 10, 10)
.addComponent(herbsLabel)
.addGap(82, 82, 82)
.addComponent(HerbsCount, javax.swing.GroupLayout.PREFERRED_SIZE, 17, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(33, 33, 33)
.addComponent(clayLabel)
.addGap(79, 79, 79)
.addComponent(ClayCount, javax.swing.GroupLayout.PREFERRED_SIZE, 17, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(23, 23, 23)
.addComponent(mineralLabel)
.addGap(76, 76, 76)
.addComponent(MineralCount, javax.swing.GroupLayout.PREFERRED_SIZE, 17, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(23, 23, 23)
.addComponent(potionLabel)
.addGap(80, 80, 80)
.addComponent(PotionCount, javax.swing.GroupLayout.PREFERRED_SIZE, 17, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(layout.createSequentialGroup()
.addGap(20, 20, 20)
.addComponent(Item5)
.addGap(9, 9, 9)
.addComponent(Item6)
.addGap(19, 19, 19)
.addComponent(Item7)
.addGap(19, 19, 19)
.addComponent(Item8)
.addGap(19, 19, 19)
.addComponent(Item9))
.addGroup(layout.createSequentialGroup()
.addGap(20, 20, 20)
.addComponent(incenceLabel)
.addGap(72, 72, 72)
.addComponent(IncenseCount, javax.swing.GroupLayout.PREFERRED_SIZE, 17, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(13, 13, 13)
.addComponent(gemsLabel)
.addGap(84, 84, 84)
.addComponent(GemsCount, javax.swing.GroupLayout.PREFERRED_SIZE, 17, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(23, 23, 23)
.addComponent(lifeElixirLabel)
.addGap(68, 68, 68)
.addComponent(LifeElixirCount, javax.swing.GroupLayout.PREFERRED_SIZE, 17, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(23, 23, 23)
.addComponent(manaCrystalLabel)
.addGap(57, 57, 57)
.addComponent(ManaCrystalCount, javax.swing.GroupLayout.PREFERRED_SIZE, 17, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(13, 13, 13)
.addComponent(philosopherStoneLabel)
.addGap(24, 24, 24)
.addComponent(PilospherCount, javax.swing.GroupLayout.PREFERRED_SIZE, 17, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(layout.createSequentialGroup()
.addGap(130, 130, 130)
.addComponent(FirstItem, javax.swing.GroupLayout.PREFERRED_SIZE, 130, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(30, 30, 30)
.addComponent(jLabel11)
.addGap(45, 45, 45)
.addComponent(SecondItem, javax.swing.GroupLayout.PREFERRED_SIZE, 130, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(130, 130, 130)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jButton3, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jButton2, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addGroup(layout.createSequentialGroup()
.addGap(20, 20, 20)
.addComponent(Item0)
.addGap(9, 9, 9)
.addComponent(Item1)
.addGap(19, 19, 19)
.addComponent(Item2)
.addGap(19, 19, 19)
.addComponent(Item3)
.addGap(19, 19, 19)
.addComponent(Item4))
.addGroup(layout.createSequentialGroup()
.addGap(20, 20, 20)
.addComponent(honeyLabel)
.addGap(82, 82, 82)
.addComponent(HoneyCount, javax.swing.GroupLayout.PREFERRED_SIZE, 17, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(10, 10, 10)
.addComponent(herbsLabel)
.addGap(82, 82, 82)
.addComponent(HerbsCount, javax.swing.GroupLayout.PREFERRED_SIZE, 17, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(33, 33, 33)
.addComponent(clayLabel)
.addGap(79, 79, 79)
.addComponent(ClayCount, javax.swing.GroupLayout.PREFERRED_SIZE, 17, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(23, 23, 23)
.addComponent(mineralLabel)
.addGap(76, 76, 76)
.addComponent(MineralCount, javax.swing.