Skip to content

Commit

Permalink
Merge pull request #213 from FIUS/FixGitHubDeploy
Browse files Browse the repository at this point in the history
made letters in artifactID lowercase and changed Version to 2.3.8.
Also formatting.
  • Loading branch information
graefjk authored Jan 4, 2024
2 parents e5a7083 + 9a33449 commit 2503a9a
Show file tree
Hide file tree
Showing 129 changed files with 1,714 additions and 1,675 deletions.
6 changes: 3 additions & 3 deletions ICGE-Log/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>de.uni-stuttgart.informatik.fius</groupId>
<artifactId>ICGE</artifactId>
<version>2.3.9-Snapshot</version>
<artifactId>icge</artifactId>
<version>2.3.8</version>
</parent>
<artifactId>ICGE-Log</artifactId>
<artifactId>icge-log</artifactId>
<name>ICGE Log</name>
<build>
<plugins>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
* This source file is part of the FIUS ICGE project.
* For more information see github.com/FIUS/ICGE2
*
*
* Copyright (c) 2019 the ICGE project authors.
*
*
* This software is available under the MIT license.
* SPDX-License-Identifier: MIT
*/
Expand All @@ -23,28 +23,28 @@
* @version 2.0
*/
public abstract class Logger {

/** The main logger printing to {@link System#out} */
public static PrintStream out;
/** The error logger printing to {@link System#err} */
public static PrintStream error;

private static OutputStreamMultiplier outStream;
private static OutputStreamMultiplier errorStream;

// This block intercepts {@link System.out} and {@link System.err}
static {
Logger.outStream = new OutputStreamMultiplier();
Logger.outStream.addOutputStream(System.out);
Logger.out = new PrintStream(Logger.outStream);
System.setOut(Logger.out);

Logger.errorStream = new OutputStreamMultiplier();
Logger.errorStream.addOutputStream(System.err);
Logger.error = new PrintStream(Logger.errorStream);
System.setErr(Logger.error);
}

/**
* Function to add a {@link OutputStream} to the out logger
*
Expand All @@ -56,7 +56,7 @@ public abstract class Logger {
public static boolean addOutOutputStream(final OutputStream stream) {
return Logger.outStream.addOutputStream(stream);
}

/**
* Function to remove a {@link OutputStream} from the out logger
*
Expand All @@ -68,7 +68,7 @@ public static boolean addOutOutputStream(final OutputStream stream) {
public static boolean removeOutOutputStream(final OutputStream stream) {
return Logger.outStream.removeOutputStream(stream);
}

/**
* Clears the out OutputStreams
*
Expand All @@ -77,7 +77,7 @@ public static boolean removeOutOutputStream(final OutputStream stream) {
public static void clearOutOutputStream() {
Logger.outStream.clearOutputStreams();
}

/**
* Function to add a {@link OutputStream} to the error logger
*
Expand All @@ -89,7 +89,7 @@ public static void clearOutOutputStream() {
public static boolean addErrorOutputStream(final OutputStream stream) {
return Logger.errorStream.addOutputStream(stream);
}

/**
* Function to remove a {@link OutputStream} from the error logger
*
Expand All @@ -101,7 +101,7 @@ public static boolean addErrorOutputStream(final OutputStream stream) {
public static boolean removeErrorOutputStream(final OutputStream stream) {
return Logger.errorStream.removeOutputStream(stream);
}

/**
* Clears the error OutputStreams
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
* This source file is part of the FIUS ICGE project.
* For more information see github.com/FIUS/ICGE2
*
*
* Copyright (c) 2019 the ICGE project authors.
*
*
* This software is available under the MIT license.
* SPDX-License-Identifier: MIT
*/
Expand All @@ -21,16 +21,16 @@
* @version 1.0
*/
public class OutputStreamMultiplier extends OutputStream {

private final ArrayList<OutputStream> listenerStreams;

/**
* Default Constructor
*/
public OutputStreamMultiplier() {
this.listenerStreams = new ArrayList<>();
}

/**
* Add a output stream to also recieve everything this stream recieves
*
Expand All @@ -41,7 +41,7 @@ public OutputStreamMultiplier() {
public boolean addOutputStream(final OutputStream listenerStream) {
return this.listenerStreams.add(listenerStream);
}

/**
* Remove a output stream from recieving everything this stream recieves
*
Expand All @@ -52,30 +52,30 @@ public boolean addOutputStream(final OutputStream listenerStream) {
public boolean removeOutputStream(final OutputStream listenerStream) {
return this.listenerStreams.remove(listenerStream);
}

/**
* Clears all connected output streams
*/
public void clearOutputStreams() {
this.listenerStreams.clear();
}

@Override
public void flush() throws IOException {
super.flush();

for (final OutputStream listenerStream : this.listenerStreams) {
listenerStream.flush();
}
}

@Override
public void write(final int arg0) throws IOException {
for (final OutputStream listenerStream : this.listenerStreams) {
listenerStream.write(arg0);
}
}

@Override
public void close() throws IOException {
for (final OutputStream listenerStream : this.listenerStreams) {
Expand Down
4 changes: 2 additions & 2 deletions ICGE-Log/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
* This source file is part of the FIUS ICGE project.
* For more information see github.com/FIUS/ICGE2
*
*
* Copyright (c) 2019 the ICGE project authors.
*
*
* This software is available under the MIT license.
* SPDX-License-Identifier: MIT
*/
Expand Down
12 changes: 8 additions & 4 deletions ICGE-ManualStart/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>de.uni-stuttgart.informatik.fius</groupId>
<artifactId>ICGE</artifactId>
<version>2.3.9-Snapshot</version>
<artifactId>icge</artifactId>
<version>2.3.8</version>
</parent>
<artifactId>ICGE-ManualStart</artifactId>
<artifactId>icge-manualstart</artifactId>
<name>ICGE Manual Start</name>
<properties>
<icge.version>2.3.8</icge.version>
</properties>
<dependencies>
<dependency>
<groupId>de.uni-stuttgart.informatik.fius</groupId>
<artifactId>ICGE-Simulation</artifactId>
<artifactId>icge-simulation</artifactId>
<version>${icge.version}</version>
</dependency>
</dependencies>
<build>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
* This source file is part of the FIUS ICGE project.
* For more information see github.com/FIUS/ICGE2
*
*
* Copyright (c) 2019 the ICGE project authors.
*
*
* This software is available under the MIT license.
* SPDX-License-Identifier: MIT
*/
Expand All @@ -19,17 +19,17 @@
* @author Fabian Bühler
*/
public class Coin extends BasicEntity implements CollectableEntity {

/**
* The texture handle used for the test entity.
*/
public static String TEXTURE_HANDLE;

@Override
protected String getTextureHandle() {
return TEXTURE_HANDLE;
}

@Override
protected int getZPosition() {
return 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
* This source file is part of the FIUS ICGE project.
* For more information see github.com/FIUS/ICGE2
*
*
* Copyright (c) 2019 the ICGE project authors.
*
*
* This software is available under the MIT license.
* SPDX-License-Identifier: MIT
*/
Expand All @@ -22,11 +22,11 @@
* @author Tim Neumann
*/
public class ManualStartSimulation {

private static String textureHandleWall;
private static String textureHandleCoin;
private static String animated;

/**
* @param args
* the command line arguments. Not used.
Expand All @@ -38,21 +38,21 @@ public static void main(final String[] args) {
// wb.setDpiScale(1.0);
wb.buildWindow();
final GameWindow w = wb.getBuiltWindow();

ManualStartSimulation.prepareTextures(w.getTextureRegistry());
TestEntity.TEXTURE_HANDLE = ManualStartSimulation.animated;
Coin.TEXTURE_HANDLE = textureHandleCoin;

final SimulationBuilder sb = new SimulationBuilder();
sb.setTaskVerifier(new TestTaskVerifier());
sb.buildSimulation();
final Simulation sim = sb.getBuiltSimulation();

w.start();
sim.attachToWindow(w, true);
sim.runTask(new TestTask());
}

private static void prepareTextures(final TextureRegistry tr) {
ManualStartSimulation.textureHandleWall = tr
.loadTextureFromResource("textures/wall-default.png", ManualStartSimulation.class::getResourceAsStream);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
* This source file is part of the FIUS ICGE project.
* For more information see github.com/FIUS/ICGE2
*
*
* Copyright (c) 2019 the ICGE project authors.
*
*
* This software is available under the MIT license.
* SPDX-License-Identifier: MIT
*/
Expand All @@ -19,7 +19,7 @@
* @author Tim Neumann
*/
public class ManualStartUi {

/**
* Main entry point of the program
*
Expand All @@ -29,7 +29,7 @@ public class ManualStartUi {
public static void main(final String[] args) {
ManualStartUi.newStyleBuilder();
}

private static void newStyleBuilder() {
final WindowBuilder wb = new WindowBuilder();
wb.setTitle("Window Builder start!");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
* This source file is part of the FIUS ICGE project.
* For more information see github.com/FIUS/ICGE2
*
*
* Copyright (c) 2019 the ICGE project authors.
*
*
* This software is available under the MIT license.
* SPDX-License-Identifier: MIT
*/
Expand All @@ -16,17 +16,17 @@
* Basic test entity.
*/
public class TestEntity extends GreedyEntity {

/**
* The texture handle used for the test entity.
*/
public static String TEXTURE_HANDLE;

@Override
protected String getTextureHandle() {
return TestEntity.TEXTURE_HANDLE;
}

@Override
protected int getZPosition() {
return 0;
Expand Down
Loading

0 comments on commit 2503a9a

Please sign in to comment.