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

find item

parent f1eaa996
...@@ -54,7 +54,43 @@ is divided into following sections: ...@@ -54,7 +54,43 @@ is divided into following sections:
<property file="nbproject/project.properties"/> <property file="nbproject/project.properties"/>
</target> </target>
<target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init"> <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
<property name="platform.java" value="${java.home}/bin/java"/> <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>
<available file="${manifest.file}" property="manifest.available"/> <available file="${manifest.file}" property="manifest.available"/>
<condition property="splashscreen.available"> <condition property="splashscreen.available">
<and> <and>
...@@ -183,15 +219,6 @@ is divided into following sections: ...@@ -183,15 +219,6 @@ is divided into following sections:
<condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}"> <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
<isset property="profile.available"/> <isset property="profile.available"/>
</condition> </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" value="false"/>
<property name="jar.index.metainf" value="${jar.index}"/> <property name="jar.index.metainf" value="${jar.index}"/>
<property name="copylibs.rebase" value="true"/> <property name="copylibs.rebase" value="true"/>
...@@ -260,7 +287,7 @@ is divided into following sections: ...@@ -260,7 +287,7 @@ is divided into following sections:
<property location="${build.dir}/empty" name="empty.dir"/> <property location="${build.dir}/empty" name="empty.dir"/>
<mkdir dir="${empty.dir}"/> <mkdir dir="${empty.dir}"/>
<mkdir dir="@{apgeneratedsrcdir}"/> <mkdir dir="@{apgeneratedsrcdir}"/>
<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}"> <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}">
<src> <src>
<dirset dir="@{gensrcdir}" erroronmissingdir="false"> <dirset dir="@{gensrcdir}" erroronmissingdir="false">
<include name="*"/> <include name="*"/>
...@@ -300,7 +327,7 @@ is divided into following sections: ...@@ -300,7 +327,7 @@ is divided into following sections:
<sequential> <sequential>
<property location="${build.dir}/empty" name="empty.dir"/> <property location="${build.dir}/empty" name="empty.dir"/>
<mkdir dir="${empty.dir}"/> <mkdir dir="${empty.dir}"/>
<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}"> <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}">
<src> <src>
<dirset dir="@{gensrcdir}" erroronmissingdir="false"> <dirset dir="@{gensrcdir}" erroronmissingdir="false">
<include name="*"/> <include name="*"/>
...@@ -381,7 +408,7 @@ is divided into following sections: ...@@ -381,7 +408,7 @@ is divided into following sections:
<element name="customize" optional="true"/> <element name="customize" optional="true"/>
<sequential> <sequential>
<property name="junit.forkmode" value="perTest"/> <property name="junit.forkmode" value="perTest"/>
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
<test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/> <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
<syspropertyset> <syspropertyset>
<propertyref prefix="test-sys-prop."/> <propertyref prefix="test-sys-prop."/>
...@@ -404,7 +431,7 @@ is divided into following sections: ...@@ -404,7 +431,7 @@ is divided into following sections:
<element name="customize" optional="true"/> <element name="customize" optional="true"/>
<sequential> <sequential>
<property name="junit.forkmode" value="perTest"/> <property name="junit.forkmode" value="perTest"/>
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
<batchtest todir="${build.test.results.dir}"> <batchtest todir="${build.test.results.dir}">
<fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/> <filename name="@{testincludes}"/>
...@@ -443,7 +470,7 @@ is divided into following sections: ...@@ -443,7 +470,7 @@ is divided into following sections:
</fileset> </fileset>
</union> </union>
<taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/> <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
<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}"> <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}">
<xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/> <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
<propertyset> <propertyset>
<propertyref prefix="test-sys-prop."/> <propertyref prefix="test-sys-prop."/>
...@@ -523,7 +550,7 @@ is divided into following sections: ...@@ -523,7 +550,7 @@ is divided into following sections:
<element name="customize" optional="true"/> <element name="customize" optional="true"/>
<sequential> <sequential>
<property name="junit.forkmode" value="perTest"/> <property name="junit.forkmode" value="perTest"/>
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
<test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/> <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
<syspropertyset> <syspropertyset>
<propertyref prefix="test-sys-prop."/> <propertyref prefix="test-sys-prop."/>
...@@ -548,7 +575,7 @@ is divided into following sections: ...@@ -548,7 +575,7 @@ is divided into following sections:
<element name="customize" optional="true"/> <element name="customize" optional="true"/>
<sequential> <sequential>
<property name="junit.forkmode" value="perTest"/> <property name="junit.forkmode" value="perTest"/>
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
<batchtest todir="${build.test.results.dir}"> <batchtest todir="${build.test.results.dir}">
<fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/> <filename name="@{testincludes}"/>
...@@ -728,6 +755,9 @@ is divided into following sections: ...@@ -728,6 +755,9 @@ is divided into following sections:
<classpath> <classpath>
<path path="@{classpath}"/> <path path="@{classpath}"/>
</classpath> </classpath>
<bootclasspath>
<path path="${platform.bootcp}"/>
</bootclasspath>
</nbjpdastart> </nbjpdastart>
</sequential> </sequential>
</macrodef> </macrodef>
...@@ -743,7 +773,9 @@ is divided into following sections: ...@@ -743,7 +773,9 @@ is divided into following sections:
</macrodef> </macrodef>
</target> </target>
<target name="-init-debug-args"> <target name="-init-debug-args">
<property name="version-output" value="java version &quot;${ant.java.version}"/> <exec executable="${platform.java}" outputproperty="version-output">
<arg value="-version"/>
</exec>
<condition property="have-jdk-older-than-1.4"> <condition property="have-jdk-older-than-1.4">
<or> <or>
<contains string="${version-output}" substring="java version &quot;1.0"/> <contains string="${version-output}" substring="java version &quot;1.0"/>
...@@ -768,7 +800,7 @@ is divided into following sections: ...@@ -768,7 +800,7 @@ is divided into following sections:
<attribute default="${debug.classpath}" name="classpath"/> <attribute default="${debug.classpath}" name="classpath"/>
<element name="customize" optional="true"/> <element name="customize" optional="true"/>
<sequential> <sequential>
<java classname="@{classname}" dir="${work.dir}" fork="true"> <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/> <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
<jvmarg line="${debug-args-line}"/> <jvmarg line="${debug-args-line}"/>
<jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
...@@ -795,7 +827,7 @@ is divided into following sections: ...@@ -795,7 +827,7 @@ is divided into following sections:
<attribute default="jvm" name="jvm"/> <attribute default="jvm" name="jvm"/>
<element name="customize" optional="true"/> <element name="customize" optional="true"/>
<sequential> <sequential>
<java classname="@{classname}" dir="${work.dir}" fork="true"> <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/> <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
<jvmarg value="-Dfile.encoding=${runtime.encoding}"/> <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
<redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/> <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
...@@ -993,7 +1025,7 @@ is divided into following sections: ...@@ -993,7 +1025,7 @@ is divided into following sections:
<j2seproject3:copylibs manifest="${tmp.manifest.file}"/> <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
<echo level="info">To run this application from the command line without Ant, try:</echo> <echo level="info">To run this application from the command line without Ant, try:</echo>
<property location="${dist.jar}" name="dist.jar.resolved"/> <property location="${dist.jar}" name="dist.jar.resolved"/>
<echo level="info">java -jar "${dist.jar.resolved}"</echo> <echo level="info">${platform.java} -jar "${dist.jar.resolved}"</echo>
</target> </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"> <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}"/> <j2seproject1:jar manifest="${tmp.manifest.file}"/>
...@@ -1202,10 +1234,13 @@ is divided into following sections: ...@@ -1202,10 +1234,13 @@ is divided into following sections:
</not> </not>
</and> </and>
</condition> </condition>
<exec executable="${platform.java}" failonerror="false" outputproperty="platform.version.output">
<arg value="-version"/>
</exec>
<condition else="" property="bug5101868workaround" value="*.java"> <condition else="" property="bug5101868workaround" value="*.java">
<matches pattern="1\.[56](\..*)?" string="${java.version}"/> <matches multiline="true" pattern="1\.[56](\..*)?" string="${platform.version.output}"/>
</condition> </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}" 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}" 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}">
<classpath> <classpath>
<path path="${javac.classpath}"/> <path path="${javac.classpath}"/>
</classpath> </classpath>
......
build.xml.data.CRC32=46045500 build.xml.data.CRC32=3a232f49
build.xml.script.CRC32=d6a6600c build.xml.script.CRC32=d6a6600c
build.xml.stylesheet.CRC32=8064a381@1.74.1.48 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. # 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. # 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=46045500 nbproject/build-impl.xml.data.CRC32=3a232f49
nbproject/build-impl.xml.script.CRC32=41a00fd2 nbproject/build-impl.xml.script.CRC32=0d1f4ad7
nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.1.48 nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.1.48
...@@ -3,29 +3,12 @@ ...@@ -3,29 +3,12 @@
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/> <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"> <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group> <group>
<<<<<<< HEAD <file>file:/D:/AFIK/Project/GrandQuest%20Sister/IF3230-Tugas-Besar-Sister-2015/src/client/src/GUI/TradePanel.java</file>
<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>
<file>file:/D:/AFIK/Project/GrandQuest%20Sister/IF3230-Tugas-Besar-Sister-2015/src/client/src/grandquest/GrandQuest.java</file> <file>file:/D:/AFIK/Project/GrandQuest%20Sister/IF3230-Tugas-Besar-Sister-2015/src/client/src/grandquest/GrandQuest.java</file>
<file>file:/D:/AFIK/Project/GrandQuest%20Sister/IF3230-Tugas-Besar-Sister-2015/src/client/src/HelperClasses/Item.java</file>
<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/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/Request/Request.java</file>
<file>file:/D:/AFIK/Project/GrandQuest%20Sister/IF3230-Tugas-Besar-Sister-2015/src/client/src/GUI/InventoryPanel.java</file> <file>file:/D:/AFIK/Project/GrandQuest%20Sister/IF3230-Tugas-Besar-Sister-2015/src/client/src/GUI/MapPanel.java</file>
>>>>>>> 86d3b7e8f0f0920102862df169fb0ad151a60dc4
</group> </group>
</open-files> </open-files>
</project-private> </project-private>
...@@ -64,7 +64,7 @@ main.class=grandquest.GrandQuest ...@@ -64,7 +64,7 @@ main.class=grandquest.GrandQuest
manifest.file=manifest.mf manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=false mkdist.disabled=false
platform.active=default_platform platform.active=JDK_1.8
run.classpath=\ run.classpath=\
${javac.classpath}:\ ${javac.classpath}:\
${build.classes.dir} ${build.classes.dir}
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<configuration> <configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3"> <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>GrandQuest</name> <name>GrandQuest</name>
<explicit-platform explicit-source-supported="true"/>
<source-roots> <source-roots>
<root id="src.dir"/> <root id="src.dir"/>
</source-roots> </source-roots>
......
...@@ -363,8 +363,8 @@ public class FindPanel extends javax.swing.JPanel { ...@@ -363,8 +363,8 @@ public class FindPanel extends javax.swing.JPanel {
break; break;
} }
GrandQuest.savedPane = this; GrandQuest.tableId = 1;
//SET TO FIND System.out.println("ID " + GrandQuest.tableId);
gq.retTrade(); gq.retTrade();
} }
}//GEN-LAST:event_findButtonActionPerformed }//GEN-LAST:event_findButtonActionPerformed
......
...@@ -23,10 +23,10 @@ public class LoginPanel extends javax.swing.JPanel { ...@@ -23,10 +23,10 @@ public class LoginPanel extends javax.swing.JPanel {
public LoginPanel() { public LoginPanel() {
// GrandQuest.host = "192.168.43.249"; // GrandQuest.host = "192.168.43.249";
// GrandQuest.port = 6789; // GrandQuest.port = 6789;
// GrandQuest.host = "localhost"; GrandQuest.host = "localhost";
// GrandQuest.port = 8080; GrandQuest.port = 8080;
GrandQuest.host = "167.205.32.46"; // GrandQuest.host = "167.205.32.46";
GrandQuest.port = 8025; // GrandQuest.port = 8025;
// GrandQuest.host = "localhost"; // GrandQuest.host = "localhost";
// GrandQuest.port = 8080; // GrandQuest.port = 8080;
// GrandQuest.host = "167.205.88.51"; // GrandQuest.host = "167.205.88.51";
......
...@@ -145,7 +145,7 @@ public class MapPanel extends javax.swing.JPanel { ...@@ -145,7 +145,7 @@ public class MapPanel extends javax.swing.JPanel {
String res = Request.findInResponses("status"); String res = Request.findInResponses("status");
switch(res){ switch(res){
case "ok" : case "ok" :
item = Item.getItem(Integer.parseInt(Request.findInResponses("item"))); item = Item.getItemName(Integer.parseInt(Request.findInResponses("item")));
JOptionPane.showMessageDialog(null, "Congratulation, you've earned "+ item,"Information", JOptionPane.PLAIN_MESSAGE); JOptionPane.showMessageDialog(null, "Congratulation, you've earned "+ item,"Information", JOptionPane.PLAIN_MESSAGE);
//PANEL MIXEDITEM //PANEL MIXEDITEM
break; break;
...@@ -249,7 +249,7 @@ public class MapPanel extends javax.swing.JPanel { ...@@ -249,7 +249,7 @@ public class MapPanel extends javax.swing.JPanel {
} else{ } else{
if (countStatus==4){ if (countStatus==4){
countStatus = 0; countStatus = 0;
statusLabel.setText("moving"); statusLabel.setText("Moving");
} else{ } else{
countStatus++; countStatus++;
statusLabel.setText(statusLabel.getText()+"."); statusLabel.setText(statusLabel.getText()+".");
...@@ -563,6 +563,7 @@ public class MapPanel extends javax.swing.JPanel { ...@@ -563,6 +563,7 @@ public class MapPanel extends javax.swing.JPanel {
} }
GrandQuest.savedPane = this; GrandQuest.savedPane = this;
GrandQuest.tableId = 0;
gq.retTrade(); gq.retTrade();
} }
}//GEN-LAST:event_tradeButtonActionPerformed }//GEN-LAST:event_tradeButtonActionPerformed
...@@ -604,34 +605,8 @@ public class MapPanel extends javax.swing.JPanel { ...@@ -604,34 +605,8 @@ public class MapPanel extends javax.swing.JPanel {
}//GEN-LAST:event_inventoryButtonActionPerformed }//GEN-LAST:event_inventoryButtonActionPerformed
private void findItemButonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_findItemButonActionPerformed private void findItemButonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_findItemButonActionPerformed
if(Request.connectToServer(GrandQuest.host,GrandQuest.port)){ GrandQuest.savedPane = this;
String sentence = Request.inventory(GrandQuest.token).toString(); gq.retFind();
Request.responseHandler(Request.send(sentence));
}
if (Request.serverResponse!=null){
String res = Request.findInResponses("status");
switch(res){
case "ok" :
String inventory = Request.findInResponses("inventory");
System.out.println(inventory);
String [] result = inventory.replaceAll("\\[", "").replaceAll("\\]", "").split(",");
GrandQuest.inventory = new ArrayList<>();
for(String number : result)
{
GrandQuest.inventory.add(Integer.parseInt(number));
}
break;
default :
JOptionPane.showMessageDialog(null, "Error!", "Error", JOptionPane.ERROR_MESSAGE);
break;
}
GrandQuest.savedPane = this;
gq.retFind();
}
}//GEN-LAST:event_findItemButonActionPerformed }//GEN-LAST:event_findItemButonActionPerformed
private void logoutButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_logoutButtonActionPerformed private void logoutButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_logoutButtonActionPerformed
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
package GUI; package GUI;
import HelperClasses.ButtonColumn; import HelperClasses.ButtonColumn;
import HelperClasses.Item;
import Request.Request; import Request.Request;
import grandquest.GrandQuest; import grandquest.GrandQuest;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
...@@ -33,7 +34,12 @@ public class TradePanel extends javax.swing.JPanel { ...@@ -33,7 +34,12 @@ public class TradePanel extends javax.swing.JPanel {
public TradePanel() { public TradePanel() {
gq = new GrandQuest(); gq = new GrandQuest();
offers = parseOffer(GrandQuest.offers); offers = parseOffer(GrandQuest.offers);
for (String[] a : offers) {
for (String b : a) {
System.out.print(b + " ");
}
System.out.println(" ");
}
initComponents(); initComponents();
initTable(); initTable();
} }
...@@ -45,11 +51,13 @@ public class TradePanel extends javax.swing.JPanel { ...@@ -45,11 +51,13 @@ public class TradePanel extends javax.swing.JPanel {
JTable createTable() { JTable createTable() {
Object[][] data; Object[][] data;
if (offers!=null){ if (offers!=null){
System.out.println("ID : " + GrandQuest.tableId);
data = new Object[offers.size()][6]; data = new Object[offers.size()][6];
for (int i = 0; i < offers.size(); i++) { for (int i = 0; i < offers.size(); i++) {
data[i][0] = new ImageIcon(getClass().getResource("/img/honey.png")); data[i][0] = new ImageIcon(getClass().getResource(Item.getItemIcon(Integer.valueOf(offers.get(i)[0]))));
data[i][1] = offers.get(i)[1]; data[i][1] = offers.get(i)[1];
data[i][2] = new ImageIcon(getClass().getResource("/img/herbs.png")); data[i][2] = new ImageIcon(getClass().getResource(Item.getItemIcon(Integer.valueOf(offers.get(i)[2]))));
data[i][3] = offers.get(i)[3]; data[i][3] = offers.get(i)[3];
if (GrandQuest.tableId==0){ if (GrandQuest.tableId==0){
if (offers.get(i)[4].equals("false")){ if (offers.get(i)[4].equals("false")){
...@@ -58,7 +66,8 @@ public class TradePanel extends javax.swing.JPanel { ...@@ -58,7 +66,8 @@ public class TradePanel extends javax.swing.JPanel {
data[i][4] = "Cancel"; data[i][4] = "Cancel";
} }
} else{ // accept panel } else{ // accept panel
System.out.println("Masuk find");
data[i][4] = "Buy";
} }
data[i][5] = offers.get(i)[5]; data[i][5] = offers.get(i)[5];
} }
...@@ -159,17 +168,21 @@ public class TradePanel extends javax.swing.JPanel { ...@@ -159,17 +168,21 @@ public class TradePanel extends javax.swing.JPanel {
data = data.replace("\"", ""); data = data.replace("\"", "");
List<String []> offers = new ArrayList<>(); List<String []> offers = new ArrayList<>();
String[] dataParse = data.replace("[","").replace("]","").replace("\"", "").split(","); String[] dataParse = data.replace("[","").replace("]","").replace("\"", "").split(",");
String[] temp; String[] temp = new String[6];
for (String dataParse1 : dataParse) { int j = 0;
temp = new String[6]; for (int i= 0; i<dataParse.length; i++) {
for (int j = 0; j < 6; j++) { temp[j] = dataParse[i];
temp[j] = dataParse[j].replace("[", ""); if (j==5) {
j = 0;
offers.add(temp);
temp = new String[6];
} }
offers.add(temp); else {
j++;
}
} }
return offers; return offers;
} else{ } else{
return null; return null;
......
...@@ -68,11 +68,19 @@ public class Item { ...@@ -68,11 +68,19 @@ public class Item {
} }
public static String getItem(int index) { public static String getItemName(int index) {
String itemName; String itemName;
createItem(); createItem();
itemName = allItem.get(index).value; itemName = allItem.get(index).value;
return itemName; return itemName;
} }
public static String getItemIcon(int index) {
String itemName;
createItem();
itemName = allItem.get(index).key;
return itemName;
}
} }