locusworks/lsproject
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleaned up the code a little
All checks were successful
Locusworks Team/lsproject/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Isaac Parenteau
2021-10-18 21:28:34 -05:00
parent 40e2af6a93
commit 2e3f668008
7 changed files with 273 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pom.xml
View File

@ -22,6 +22,27 @@
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<finalName>LSProject</finalName>
<shadedArtifactAttached>true</shadedArtifactAttached>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>net.locusworks.lsproject.driver.Program</mainClass>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

12
src/main/java/net/locusworks/lsproject/driver/Program.java
View File

@ -28,17 +28,6 @@ public class Program {
* and System.err are sent instead to a designated console window.
*/
public static void setupStreams() {
PrintStream errorStream = new PrintStream(new OutputStream() {
@Override
public void write(int c) throws IOException {
write(new byte[] { Byte.parseByte(Integer.toString(c)) });
}
public void write(byte[] b) {
console.writeError(new String(b));
}
});
PrintStream outputStream = new PrintStream(new OutputStream() {
@Override
public void write(int c) throws IOException {
@ -50,7 +39,6 @@ public class Program {
}
});
//System.setErr(errorStream);
System.setOut(outputStream);
}
}

16
src/main/java/net/locusworks/lsproject/gui/CostViewerWindow.java
View File

@ -2,8 +2,6 @@ package net.locusworks.lsproject.gui;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.GridLayout;
import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
@ -12,7 +10,6 @@ import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
import javax.swing.table.TableModel;
import net.locusworks.lsproject.driver.Program;
import net.locusworks.lsproject.object.Network;
import net.locusworks.lsproject.object.Router;
@ -22,7 +19,6 @@ public class CostViewerWindow extends JPanel implements TableModelListener{
*
*/
private static final long serialVersionUID = 8571350255455457432L;
private boolean DEBUG = false;
private Router router = null;
@ -31,8 +27,7 @@ public class CostViewerWindow extends JPanel implements TableModelListener{
router = _router;
String[] columnNames = {"Connection",
"Cost"};
String[] columnNames = {"Connection", "Cost"};
int numberOfConnections = router.getConnections().size();
@ -102,13 +97,10 @@ public class CostViewerWindow extends JPanel implements TableModelListener{
return;
}
router.getConnectionByParticipant(
router.getIpAddress(), otherRouterIp).setCost(newCost);
router.getConnectionByParticipant(router.getIpAddress(), otherRouterIp).setCost(newCost);
Router otherRouter = Network.getInstance().getRouterByIp(otherRouterIp);
otherRouter.getConnectionByParticipant(
router.getIpAddress(), otherRouterIp).setCost(newCost);
}
catch (NumberFormatException ex) {
otherRouter.getConnectionByParticipant(router.getIpAddress(), otherRouterIp).setCost(newCost);
} catch (NumberFormatException ex) {
System.out.println("Invalid cost.");
}
}

6
src/main/java/net/locusworks/lsproject/gui/RouterViewerWindow.java
View File

@ -360,9 +360,7 @@ public class RouterViewerWindow extends JFrame implements MouseListener,
@Override public void keyPressed(KeyEvent e) {
keys[e.getKeyCode()] = true;
if (highlightedRouter != null &&
!highlightedRouter.equals("") &&
keys[KeyEvent.VK_DELETE]) {
if (highlightedRouter != null && !highlightedRouter.equals("") && keys[KeyEvent.VK_DELETE]) {
Network.getInstance().removeRouterByIp(highlightedRouter);
try {
@ -375,7 +373,7 @@ public class RouterViewerWindow extends JFrame implements MouseListener,
updateAllRouters();
}
else if (keys[KeyEvent.VK_S] && ((e.getModifiers() & KeyEvent.VK_CONTROL) == 0)) {
else if (keys[KeyEvent.VK_S] && ((e.getModifiersEx() & KeyEvent.VK_CONTROL) == 0)) {
try {
Utility.saveNetwork();

10
src/main/java/net/locusworks/lsproject/gui/RoutingTableWindow.java
View File

@ -8,7 +8,6 @@ import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.table.AbstractTableModel;
import net.locusworks.lsproject.driver.Program;
import net.locusworks.lsproject.object.Network;
import net.locusworks.lsproject.object.Router;
import net.locusworks.lsproject.object.helper.DijkstraCallback;
@ -155,15 +154,6 @@ public class RoutingTableWindow extends JFrame implements WindowListener {
return -1;
}
public int getRowByFirstCellName(String cellName) {
for (int i = 1; i < getRowCount(); i++) {
if (columnNames.get(i).endsWith(cellName)) {
return i;
}
}
return -1;
}
@Override public int getColumnCount() {
return columnNames.size();

5
src/main/java/net/locusworks/lsproject/gui/StartupWindow.java
View File

@ -2,16 +2,11 @@ package net.locusworks.lsproject.gui;
import java.awt.*;
import java.awt.event.*;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import javax.swing.*;
import javax.swing.filechooser.FileFilter;
import net.locusworks.lsproject.driver.Program;
import net.locusworks.lsproject.gui.helper.ImageHelper;
import net.locusworks.lsproject.object.Network;
import net.locusworks.lsproject.util.Utility;

1
src/test/java/object/NetworkTest.java
View File

@ -7,7 +7,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import net.locusworks.lsproject.driver.Program;
import net.locusworks.lsproject.object.Connection;
import net.locusworks.lsproject.object.DijkstraEngine;
import net.locusworks.lsproject.object.Network;