Skip to content

Commit

Permalink
Merge pull request #3 from karakasis/Update2
Browse files Browse the repository at this point in the history 
Update2
  • Loading branch information
@karakasis
karakasis authored May 9, 2018
2 parents dee550c + 2a007d2 commit bcacac1
Show file tree
Hide file tree
Showing 6 changed files with 381 additions and 110 deletions.
2 changes: 1 addition & 1 deletion STS/Controller.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public Controller(Tail t, GUI g) {
_tObj = new Tail();
_tObj.setUpTailer(_load.getLogFile(), this);

_tObj.actionIsComing();
//_tObj.actionIsComing();
//_load.startSlayTheSpireSTEAM();
}

Expand Down
40 changes: 20 additions & 20 deletions STS/GUI.form
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="60" y="40" width="160" height="260"/>
<AbsoluteConstraints x="50" y="40" width="180" height="260"/>
</Constraint>
</Constraints>

Expand Down Expand Up @@ -434,7 +434,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="13" y="191" width="-1" height="34"/>
<AbsoluteConstraints x="0" y="188" width="-1" height="34"/>
</Constraint>
</Constraints>
</Component>
Expand All @@ -446,7 +446,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="10" y="111" width="-1" height="34"/>
<AbsoluteConstraints x="0" y="108" width="-1" height="34"/>
</Constraint>
</Constraints>
</Component>
Expand All @@ -458,7 +458,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="10" y="71" width="-1" height="34"/>
<AbsoluteConstraints x="0" y="68" width="-1" height="34"/>
</Constraint>
</Constraints>
</Component>
Expand All @@ -470,7 +470,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="10" y="31" width="-1" height="34"/>
<AbsoluteConstraints x="0" y="31" width="-1" height="34"/>
</Constraint>
</Constraints>
</Component>
Expand All @@ -482,7 +482,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="17" y="151" width="-1" height="34"/>
<AbsoluteConstraints x="5" y="148" width="-1" height="34"/>
</Constraint>
</Constraints>
</Component>
Expand All @@ -494,7 +494,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="13" y="231" width="-1" height="34"/>
<AbsoluteConstraints x="0" y="228" width="-1" height="34"/>
</Constraint>
</Constraints>
</Component>
Expand Down Expand Up @@ -640,7 +640,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="13" y="188" width="-1" height="34"/>
<AbsoluteConstraints x="0" y="188" width="-1" height="34"/>
</Constraint>
</Constraints>
</Component>
Expand All @@ -652,7 +652,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="10" y="108" width="-1" height="34"/>
<AbsoluteConstraints x="0" y="108" width="-1" height="34"/>
</Constraint>
</Constraints>
</Component>
Expand All @@ -664,7 +664,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="10" y="68" width="-1" height="34"/>
<AbsoluteConstraints x="0" y="68" width="-1" height="34"/>
</Constraint>
</Constraints>
</Component>
Expand All @@ -676,7 +676,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="10" y="31" width="-1" height="34"/>
<AbsoluteConstraints x="0" y="31" width="-1" height="34"/>
</Constraint>
</Constraints>
</Component>
Expand All @@ -688,7 +688,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="13" y="228" width="-1" height="34"/>
<AbsoluteConstraints x="0" y="228" width="-1" height="34"/>
</Constraint>
</Constraints>
</Component>
Expand All @@ -700,7 +700,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="17" y="148" width="-1" height="34"/>
<AbsoluteConstraints x="5" y="148" width="-1" height="34"/>
</Constraint>
</Constraints>
</Component>
Expand All @@ -726,7 +726,7 @@
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="65" y="68" width="58" height="34"/>
<AbsoluteConstraints x="70" y="68" width="58" height="34"/>
</Constraint>
</Constraints>
</Component>
Expand Down Expand Up @@ -755,7 +755,7 @@
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="65" y="31" width="58" height="34"/>
<AbsoluteConstraints x="70" y="31" width="58" height="34"/>
</Constraint>
</Constraints>
</Component>
Expand All @@ -781,7 +781,7 @@
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="65" y="108" width="58" height="34"/>
<AbsoluteConstraints x="70" y="108" width="58" height="34"/>
</Constraint>
</Constraints>
</Component>
Expand All @@ -807,7 +807,7 @@
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="65" y="148" width="58" height="34"/>
<AbsoluteConstraints x="70" y="148" width="58" height="34"/>
</Constraint>
</Constraints>
</Component>
Expand All @@ -833,7 +833,7 @@
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="65" y="188" width="58" height="34"/>
<AbsoluteConstraints x="70" y="188" width="58" height="34"/>
</Constraint>
</Constraints>
</Component>
Expand All @@ -847,7 +847,7 @@
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="125" y="68" width="-1" height="34"/>
<AbsoluteConstraints x="130" y="68" width="-1" height="34"/>
</Constraint>
</Constraints>
</Component>
Expand All @@ -868,7 +868,7 @@
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="48" y="224" width="110" height="33"/>
<AbsoluteConstraints x="58" y="224" width="110" height="33"/>
</Constraint>
</Constraints>
</Component>
Expand Down
Loading

0 comments on commit bcacac1

Please sign in to comment.