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

Merge branch 'master' of...

Merge branch 'master' of http://gitlab.informatika.org/sinambelajunita/IF3230-Tugas-Besar-Sister-2015
parents 8188d806 d019e888
...@@ -54,43 +54,7 @@ is divided into following sections: ...@@ -54,43 +54,7 @@ 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">
<j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/> <property name="platform.java" value="${java.home}/bin/java"/>
<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>
...@@ -219,6 +183,15 @@ is divided into following sections: ...@@ -219,6 +183,15 @@ 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"/>
...@@ -287,7 +260,7 @@ is divided into following sections: ...@@ -287,7 +260,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}" 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> <src>
<dirset dir="@{gensrcdir}" erroronmissingdir="false"> <dirset dir="@{gensrcdir}" erroronmissingdir="false">
<include name="*"/> <include name="*"/>
...@@ -327,7 +300,7 @@ is divided into following sections: ...@@ -327,7 +300,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}" 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> <src>
<dirset dir="@{gensrcdir}" erroronmissingdir="false"> <dirset dir="@{gensrcdir}" erroronmissingdir="false">
<include name="*"/> <include name="*"/>
...@@ -408,7 +381,7 @@ is divided into following sections: ...@@ -408,7 +381,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}" 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}"/> <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
<syspropertyset> <syspropertyset>
<propertyref prefix="test-sys-prop."/> <propertyref prefix="test-sys-prop."/>
...@@ -431,7 +404,7 @@ is divided into following sections: ...@@ -431,7 +404,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}" 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}"> <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}"/>
...@@ -470,7 +443,7 @@ is divided into following sections: ...@@ -470,7 +443,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" 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}"/> <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
<propertyset> <propertyset>
<propertyref prefix="test-sys-prop."/> <propertyref prefix="test-sys-prop."/>
...@@ -550,7 +523,7 @@ is divided into following sections: ...@@ -550,7 +523,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}" 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}"/> <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
<syspropertyset> <syspropertyset>
<propertyref prefix="test-sys-prop."/> <propertyref prefix="test-sys-prop."/>
...@@ -575,7 +548,7 @@ is divided into following sections: ...@@ -575,7 +548,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}" 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}"> <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}"/>
...@@ -755,9 +728,6 @@ is divided into following sections: ...@@ -755,9 +728,6 @@ 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>
...@@ -773,9 +743,7 @@ is divided into following sections: ...@@ -773,9 +743,7 @@ is divided into following sections:
</macrodef> </macrodef>
</target> </target>
<target name="-init-debug-args"> <target name="-init-debug-args">
<exec executable="${platform.java}" outputproperty="version-output"> <property name="version-output" value="java version &quot;${ant.java.version}"/>
<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"/>
...@@ -800,7 +768,7 @@ is divided into following sections: ...@@ -800,7 +768,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" jvm="${platform.java}"> <java classname="@{classname}" dir="${work.dir}" fork="true">
<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}"/>
...@@ -827,7 +795,7 @@ is divided into following sections: ...@@ -827,7 +795,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" jvm="${platform.java}"> <java classname="@{classname}" dir="${work.dir}" fork="true">
<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}"/>
...@@ -1025,7 +993,7 @@ is divided into following sections: ...@@ -1025,7 +993,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">${platform.java} -jar "${dist.jar.resolved}"</echo> <echo level="info">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}"/>
...@@ -1234,13 +1202,10 @@ is divided into following sections: ...@@ -1234,13 +1202,10 @@ 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 multiline="true" pattern="1\.[56](\..*)?" string="${platform.version.output}"/> <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
</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}" 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> <classpath>
<path path="${javac.classpath}"/> <path path="${javac.classpath}"/>
</classpath> </classpath>
......
build.xml.data.CRC32=3a232f49 build.xml.data.CRC32=46045500
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=3a232f49 nbproject/build-impl.xml.data.CRC32=46045500
nbproject/build-impl.xml.script.CRC32=0d1f4ad7 nbproject/build-impl.xml.script.CRC32=41a00fd2
nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.1.48 nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.1.48
...@@ -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=JDK_1.8 platform.active=default_platform
run.classpath=\ run.classpath=\
${javac.classpath}:\ ${javac.classpath}:\
${build.classes.dir} ${build.classes.dir}
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
<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>
......
...@@ -22,6 +22,9 @@ public class InventoryPanel extends javax.swing.JPanel { ...@@ -22,6 +22,9 @@ public class InventoryPanel extends javax.swing.JPanel {
initItem(); initItem();
} }
/**
* assign item value from inventory
*/
public void initItem(){ public void initItem(){
HoneyCount.setText(GrandQuest.inventory.get(0).toString()); HoneyCount.setText(GrandQuest.inventory.get(0).toString());
HerbsCount.setText(GrandQuest.inventory.get(1).toString()); HerbsCount.setText(GrandQuest.inventory.get(1).toString());
......
...@@ -44,16 +44,14 @@ public class MapPanel extends javax.swing.JPanel { ...@@ -44,16 +44,14 @@ public class MapPanel extends javax.swing.JPanel {
static int posX, posY; static int posX, posY;
static int desiredX, desiredY; static int desiredX, desiredY;
static long moveTime; static long moveTime;
static int countStatus; static int countStatus; // counter for label animation ("Moving....")
static String item; static String item;
/** /**
* Creates new form MapPanel * Creates new form MapPanel
* @throws java.lang.InterruptedException
*/ */
public MapPanel() { public MapPanel() {
System.out.println("sadfka");
countStatus = 0; countStatus = 0;
posX = Integer.valueOf(Request.findInResponses("x")); posX = Integer.valueOf(Request.findInResponses("x"));
posY = Integer.valueOf(Request.findInResponses("y")); posY = Integer.valueOf(Request.findInResponses("y"));
...@@ -160,6 +158,7 @@ public class MapPanel extends javax.swing.JPanel { ...@@ -160,6 +158,7 @@ public class MapPanel extends javax.swing.JPanel {
} }
} }
} }
/** /**
* Map's mouse click listener * Map's mouse click listener
*/ */
...@@ -199,6 +198,13 @@ public class MapPanel extends javax.swing.JPanel { ...@@ -199,6 +198,13 @@ public class MapPanel extends javax.swing.JPanel {
return new JTable(data, columnNames); return new JTable(data, columnNames);
} }
/**
* scale a certain image and return it
* @param srcImg
* @param w
* @param h
* @return
*/
private ImageIcon getScaledImage(Image srcImg, int w, int h){ private ImageIcon getScaledImage(Image srcImg, int w, int h){
BufferedImage resizedImg = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB); BufferedImage resizedImg = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
Graphics2D g2 = resizedImg.createGraphics(); Graphics2D g2 = resizedImg.createGraphics();
...@@ -208,6 +214,11 @@ public class MapPanel extends javax.swing.JPanel { ...@@ -208,6 +214,11 @@ public class MapPanel extends javax.swing.JPanel {
return new ImageIcon(resizedImg); return new ImageIcon(resizedImg);
} }
/**
* convert an epoch time format to human DateTime format
* @param time
* @return
*/
public String epochToTime(long time){ public String epochToTime(long time){
Date date = new Date(time); Date date = new Date(time);
DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
...@@ -216,6 +227,10 @@ public class MapPanel extends javax.swing.JPanel { ...@@ -216,6 +227,10 @@ public class MapPanel extends javax.swing.JPanel {
return timeStamp; return timeStamp;
} }
/**
* Timer function to increment time to show current time
* also have a task to apply "move" action
*/
public void incrementTime(){ public void incrementTime(){
ActionListener time = new ActionListener() { ActionListener time = new ActionListener() {
......
...@@ -13,7 +13,6 @@ import java.awt.Image; ...@@ -13,7 +13,6 @@ import java.awt.Image;
import java.awt.RenderingHints; import java.awt.RenderingHints;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import javax.swing.ImageIcon; import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
/** /**
...@@ -38,6 +37,9 @@ public class MixItemPanel extends javax.swing.JPanel { ...@@ -38,6 +37,9 @@ public class MixItemPanel extends javax.swing.JPanel {
initItem(); initItem();
} }
/**
* set item value from inventory
*/
public void initItem(){ public void initItem(){
HoneyCount.setText(GrandQuest.inventory.get(0).toString()); HoneyCount.setText(GrandQuest.inventory.get(0).toString());
HerbsCount.setText(GrandQuest.inventory.get(1).toString()); HerbsCount.setText(GrandQuest.inventory.get(1).toString());
...@@ -51,6 +53,13 @@ public class MixItemPanel extends javax.swing.JPanel { ...@@ -51,6 +53,13 @@ public class MixItemPanel extends javax.swing.JPanel {
PilospherCount.setText(GrandQuest.inventory.get(9).toString()); PilospherCount.setText(GrandQuest.inventory.get(9).toString());
} }
/**
* scale a certain image and return it
* @param srcImg
* @param w
* @param h
* @return
*/
private ImageIcon getScaledImage(Image srcImg, int w, int h){ private ImageIcon getScaledImage(Image srcImg, int w, int h){
BufferedImage resizedImg = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB); BufferedImage resizedImg = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
Graphics2D g2 = resizedImg.createGraphics(); Graphics2D g2 = resizedImg.createGraphics();
......
...@@ -8,7 +8,6 @@ package GUI; ...@@ -8,7 +8,6 @@ package GUI;
import Request.Request; import Request.Request;
import grandquest.GrandQuest; import grandquest.GrandQuest;
import java.util.ArrayList;
import javax.swing.ImageIcon; import javax.swing.ImageIcon;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
...@@ -21,6 +20,7 @@ public class OfferingPanel extends javax.swing.JPanel { ...@@ -21,6 +20,7 @@ public class OfferingPanel extends javax.swing.JPanel {
String firstItem = null; String firstItem = null;
String secondItem = null; String secondItem = null;
/** /**
* Creates new form OfferingPanel * Creates new form OfferingPanel
*/ */
...@@ -30,6 +30,9 @@ public class OfferingPanel extends javax.swing.JPanel { ...@@ -30,6 +30,9 @@ public class OfferingPanel extends javax.swing.JPanel {
initItem(); initItem();
} }
/**
* set item value from inventory
*/
public void initItem(){ public void initItem(){
HoneyCount.setText(GrandQuest.inventory.get(0).toString()); HoneyCount.setText(GrandQuest.inventory.get(0).toString());
HerbsCount.setText(GrandQuest.inventory.get(1).toString()); HerbsCount.setText(GrandQuest.inventory.get(1).toString());
...@@ -657,6 +660,7 @@ public class OfferingPanel extends javax.swing.JPanel { ...@@ -657,6 +660,7 @@ public class OfferingPanel extends javax.swing.JPanel {
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
if(Request.connectToServer(GrandQuest.host,GrandQuest.port)){ if(Request.connectToServer(GrandQuest.host,GrandQuest.port)){
String sentence = Request.offer(GrandQuest.token,FirstItem.getName(),FirstAmount.getText(),SecondItem.getName(),SecondAmount.getText()).toString(); String sentence = Request.offer(GrandQuest.token,FirstItem.getName(),FirstAmount.getText(),SecondItem.getName(),SecondAmount.getText()).toString();
System.out.println(sentence);
Request.responseHandler(Request.send(sentence)); Request.responseHandler(Request.send(sentence));
} }
......
...@@ -11,8 +11,6 @@ import Request.Request; ...@@ -11,8 +11,6 @@ import Request.Request;
import grandquest.GrandQuest; import grandquest.GrandQuest;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.swing.AbstractAction; import javax.swing.AbstractAction;
...@@ -53,10 +51,14 @@ public class TradePanel extends javax.swing.JPanel { ...@@ -53,10 +51,14 @@ public class TradePanel extends javax.swing.JPanel {
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("/img/herbs.png"));
data[i][3] = offers.get(i)[3]; data[i][3] = offers.get(i)[3];
if (offers.get(i)[4].equals("false")){ if (GrandQuest.tableId==0){
data[i][4] = "Fetch"; if (offers.get(i)[4].equals("false")){
} else{ data[i][4] = "Fetch";
data[i][4] = "Cancel"; } else{
data[i][4] = "Cancel";
}
} else{ // accept panel
} }
data[i][5] = offers.get(i)[5]; data[i][5] = offers.get(i)[5];
} }
...@@ -69,6 +71,9 @@ public class TradePanel extends javax.swing.JPanel { ...@@ -69,6 +71,9 @@ public class TradePanel extends javax.swing.JPanel {
return new JTable(data, columnNames); return new JTable(data, columnNames);
} }
/**
* Offer Table initialization
*/
public void initTable(){ public void initTable(){
Offer.getColumnModel().getColumn(5).setMinWidth(0); Offer.getColumnModel().getColumn(5).setMinWidth(0);
Offer.getColumnModel().getColumn(5).setMaxWidth(0); Offer.getColumnModel().getColumn(5).setMaxWidth(0);
......
...@@ -333,6 +333,7 @@ public class Request { ...@@ -333,6 +333,7 @@ public class Request {
byte[] resp_byte = new byte[4096]; byte[] resp_byte = new byte[4096];
int resp_size = response.read(resp_byte); int resp_size = response.read(resp_byte);
String resp = new String(resp_byte); String resp = new String(resp_byte);
System.out.println("resp: " + resp);
return resp; return resp;
} catch (IOException ex) { } catch (IOException ex) {
System.out.println("Disconnected From Server"); System.out.println("Disconnected From Server");
......
...@@ -33,6 +33,7 @@ public class GrandQuest { ...@@ -33,6 +33,7 @@ public class GrandQuest {
static public List<Integer> inventory; static public List<Integer> inventory;
static public String offers; static public String offers;
static public int tableId; // table identifier - 0 for tradebox, 1 for accept panel
/** /**
* used to save a certain panel * used to save a certain panel
...@@ -70,6 +71,7 @@ public class GrandQuest { ...@@ -70,6 +71,7 @@ public class GrandQuest {
} }
public void retTrade(){ public void retTrade(){
tableId = 0;
mf.setContentPane(new TradePanel()); mf.setContentPane(new TradePanel());
mf.revalidate(); mf.revalidate();
}