Skip to content

Commit e841525

Browse files
committed
Revert "Remove IUT specific stuff"
This reverts commit 2050257.
1 parent 72e0b47 commit e841525

File tree

6 files changed

+38
-3
lines changed

6 files changed

+38
-3
lines changed

iutScripts/buildAndRunCLI.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
cd /users/dut/info/$USER/git/projet_s2/
3+
export JAVA_HOME="/users/dut/info/demmanuv/git/jdk-11.0.1"
4+
JAVA_HOME="/users/dut/info/demmanuv/git/jdk-11.0.1" mvn package
5+
$JAVE_HOME/bin/java -jar target/project-armstrong-0.0.1-SNAPSHOT-jar-with-dependencies.jar

iutScripts/buildAndRunUI.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
cd /users/dut/info/$USER/git/projet_s2/
3+
export JAVA_HOME="/users/dut/info/demmanuv/git/jdk-11.0.1"
4+
JAVA_HOME="/users/dut/info/demmanuv/git/jdk-11.0.1" mvn package
5+
$JAVE_HOME/bin/java -jar target/project-armstrong-0.0.1-SNAPSHOT-jar-with-dependencies.jar gui

iutScripts/launchEclipse.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/bash
2+
~/git/eclipse/eclipse

iutScripts/setupJava11AtIUT.sh

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/bin/bash
2+
mkdir ~/.m2/
3+
settings=$(cat << EOF
4+
<settings>
5+
<proxies>
6+
<proxy>
7+
<id>example-proxy</id>
8+
<active>true</active>
9+
<protocol>http</protocol>
10+
<host>172.30.1.1</host>
11+
<port>3128</port>
12+
</proxy>
13+
</proxies>
14+
</settings>
15+
EOF
16+
)
17+
echo $settings > ~/.m2/settings.xml
18+
cd ~/git
19+
wget http://ftp.fau.de/eclipse/technology/epp/downloads/release/2018-12/R/eclipse-java-2018-12-R-linux-gtk-x86_64.tar.gz
20+
tar -xvf eclipse*
21+
rm *tar.gz
22+
echo "export PATH=$PATH:/users/dut/info/$USER/git/projet_s2/iutScripts" >> ~/.bashrc
23+
source ~/.bashrc

src/projetarm_v2/simulator/ui/javafx/Gui.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ public static void main(String[] args) {
8585
@Override
8686
public void start(Stage primaryStage) {
8787
this.simulator = new ArmSimulator();
88+
this.simulator.setRandomPattern();
8889
this.executionMode = false;
8990
this.running = new AtomicBoolean(false);
9091
this.interfaceBeingUpdated = new AtomicBoolean(false);

src/projetarm_v2/simulator/ui/javafx/ramview/RamView.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class RamView {
3939
private ScrollBar memoryScrollBar;
4040
private TableView<NewLineRam> tableView;
4141

42-
private int firstDisplayedAddress;
42+
private int firstDisplayedAddress = 0;
4343

4444
private RamObservableListAdapter UneSuperImplemFournieParValentinLeBg;
4545

@@ -54,8 +54,7 @@ public class RamView {
5454
* @param simulator the simulator
5555
*/
5656
public RamView(ArmSimulator simulator) {
57-
this.simulator = simulator;
58-
this.firstDisplayedAddress = simulator.getStartingAddress();
57+
this.simulator=simulator;
5958
try {
6059
mainPane = FXMLLoader.load(getClass().getResource("/resources/MemoryView.fxml"));
6160
} catch (IOException e) {

0 commit comments

Comments
 (0)