Commit bf35f666 authored by Mihai Herda's avatar Mihai Herda
Browse files

Merge branch 'master' of git.scc.kit.edu:py8074/dibugger

parents 119d9aa3 891d7a02
......@@ -17,9 +17,6 @@ import dibugger.debuglogic.antlrparser.WlangLexer;
import dibugger.debuglogic.antlrparser.WlangParser;
import dibugger.debuglogic.exceptions.ConditionalBreakpointSyntaxException;
import dibugger.debuglogic.exceptions.DIbuggerLogicException;
import dibugger.debuglogic.exceptions.IncompatibleTypeException;
import dibugger.debuglogic.exceptions.SyntaxException;
import dibugger.debuglogic.exceptions.IdentifierNotFoundException;
/**
* @author wagner
......
......@@ -5,7 +5,6 @@ import java.util.List;
import dibugger.debuglogic.exceptions.AlreadyDeclaredException;
import dibugger.debuglogic.exceptions.DIbuggerLogicException;
import dibugger.debuglogic.exceptions.IdentifierNotFoundException;
/**
* Command to declare a variable.
......
......@@ -16,7 +16,6 @@ import java.util.Stack;
import org.antlr.v4.runtime.CharStream;
import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.tree.ParseTree;
import dibugger.debuglogic.antlrparser.ActuallyHelpfulErrorListener;
......
......@@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import dibugger.debuglogic.exceptions.DIbuggerLogicException;
import dibugger.debuglogic.exceptions.InvalidProgramException;
import dibugger.debuglogic.exceptions.RoutineNotFoundException;
/**
......
......@@ -23,7 +23,6 @@ import dibugger.debuglogic.antlrparser.WlangParser.FloatLiteralContext;
import dibugger.debuglogic.antlrparser.WlangParser.IdConditionContext;
import dibugger.debuglogic.antlrparser.WlangParser.IdContext;
import dibugger.debuglogic.antlrparser.WlangParser.InputparameterArrayContext;
import dibugger.debuglogic.antlrparser.WlangParser.InputparameterContext;
import dibugger.debuglogic.antlrparser.WlangParser.InputparameterNoArrayContext;
import dibugger.debuglogic.antlrparser.WlangParser.IntLiteralContext;
import dibugger.debuglogic.antlrparser.WlangParser.LessCompContext;
......@@ -41,7 +40,6 @@ import dibugger.debuglogic.antlrparser.WlangParser.OneDimArrayAccessRelContext;
import dibugger.debuglogic.antlrparser.WlangParser.OrConditionContext;
import dibugger.debuglogic.antlrparser.WlangParser.RelIdConditionContext;
import dibugger.debuglogic.antlrparser.WlangParser.RelIdContext;
import dibugger.debuglogic.antlrparser.WlangParser.StatementContext;
import dibugger.debuglogic.antlrparser.WlangParser.SubtractionContext;
import dibugger.debuglogic.antlrparser.WlangParser.ThreeDimArrayAccessContext;
import dibugger.debuglogic.antlrparser.WlangParser.ThreeDimArrayAccessRelContext;
......
......@@ -12,10 +12,10 @@ public enum Type {
(new ConstantTerm(new LongValue(0)))), FLOAT((new ConstantTerm(new FloatValue(0)))), DOUBLE(
(new ConstantTerm(new DoubleValue(0)))), CHAR((new ConstantTerm(new CharValue('a')))), BOOLEAN(
(new ConstantTerm(new BooleanValue(false)))), ARRAY((new ConstantTerm(null)));
private final Term defaultConstantTerm;
// private final Term defaultConstantTerm;
private Type(final Term defaultConstantTerm) {
this.defaultConstantTerm = defaultConstantTerm;
// this.defaultConstantTerm = defaultConstantTerm;
}
public Term getDefault() {
......
......@@ -13,8 +13,6 @@ import dibugger.debuglogic.antlrparser.ActuallyHelpfulSyntaxException;
import dibugger.debuglogic.antlrparser.WlangLexer;
import dibugger.debuglogic.antlrparser.WlangParser;
import dibugger.debuglogic.exceptions.DIbuggerLogicException;
import dibugger.debuglogic.exceptions.SyntaxException;
import dibugger.debuglogic.exceptions.IdentifierNotFoundException;
import dibugger.debuglogic.exceptions.WatchExpressionSyntaxException;
/**
......
......@@ -4,7 +4,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.URISyntaxException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
......
......@@ -8,7 +8,6 @@ import java.util.Map;
import static dibugger.filehandler.rdbf.RDBFParser.*;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
......
......@@ -3,11 +3,9 @@ package dibugger.filehandler.rdbf;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import dibugger.filehandler.exceptions.FileHandlerException;
......
......@@ -4,7 +4,6 @@ import java.io.BufferedWriter;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.nio.charset.StandardCharsets;
......
......@@ -10,6 +10,7 @@ import javax.swing.*;
* mechanisms.
*/
public class CommandPanel extends JPanel {
private static final long serialVersionUID = -4554622575639836280L;
private JButton start;
private JButton stop;
private JButton step;
......
......@@ -15,7 +15,6 @@ import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Observable;
......@@ -25,6 +24,7 @@ import java.util.Observable;
* edit and delete his conditional breakpoints.
*/
public class ConditionalBreakpointPanel extends ExpressionPanel {
private static final long serialVersionUID = -5451353323378495075L;
private static ConditionalBreakpointPanel singleton = null;
private MainInterface mainInterface;
......@@ -150,6 +150,8 @@ public class ConditionalBreakpointPanel extends ExpressionPanel {
dataEntries.add(s);
mainInterface.getControlFacade().createConditionalBreakpoint(0, "false");
tableModel = new DefaultTableModel(createDataFromList(), columnTitles) {
private static final long serialVersionUID = 8335695487059890207L;
@Override
public boolean isCellEditable(int row, int column) {
return column == 1;
......
......@@ -7,6 +7,7 @@ import java.util.Observable;
* Abstract class.
*/
public abstract class ExpressionPanel extends JPanel {
private static final long serialVersionUID = -6801243723500555354L;
String panelType = "ExpressionPanel";
......
......@@ -10,10 +10,7 @@ import javax.swing.filechooser.FileNameExtensionFilter;
import java.awt.*;
import java.awt.event.*;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Observable;
......@@ -25,6 +22,7 @@ import java.util.TreeMap;
* @author joana & chiara
*/
public class MainInterface extends JFrame {
private static final long serialVersionUID = -3097557145495125580L;
private static String FILE_MENU = "Datei";
private static String RESET_GUI = "Zur\u00fccksetzen";
private static String ADD_PROGRAM = "Programm hinzuf\u00fcgen";
......
......@@ -16,6 +16,8 @@ import java.util.Observable;
import java.util.TreeMap;
public class ProgramPanel extends JPanel {
private static final long serialVersionUID = -1894798576883319771L;
private static String PROGRAM = "Programm";
private static String STEPSIZE = "Schrittgr\u00f6\u00dfe";
private static String INPUT_VARS = "Eingabevariablen";
......@@ -189,12 +191,16 @@ public class ProgramPanel extends JPanel {
listBreakpointLines = new ArrayList<>();
editor = new JEditorPane(){
@Override
private static final long serialVersionUID = -5254668963072359090L;
@Override
public void setText(String t) {
super.setText(prepareText(t));
}
};
editor.setEditorKit(new StyledEditorKit() {
private static final long serialVersionUID = 1485124046260817775L;
@Override
public ViewFactory getViewFactory() {
return new CustomViewFactory(super.getViewFactory());
......
......@@ -9,6 +9,8 @@ import java.awt.event.FocusEvent;
* we lose focus.
*/
public class SelectionPreservingCaret extends DefaultCaret {
private static final long serialVersionUID = -4111360723415945097L;
/**
* The last SelectionPreservingCaret that lost focus
*/
......
......@@ -10,12 +10,9 @@ import javax.swing.*;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.DefaultTableModel;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Observable;
......@@ -26,6 +23,8 @@ import java.util.Observable;
*/
public class WatchExpressionPanel extends ExpressionPanel {
private static final long serialVersionUID = -4353228873798778448L;
private MainInterface mainInterface;
private java.util.List<String[]> dataEntries;
private HashMap<Integer, Integer> idMap = new HashMap<>();
......@@ -150,6 +149,8 @@ public class WatchExpressionPanel extends ExpressionPanel {
mainInterface.getControlFacade().createWatchExpression(0, "false");
tableModel = new DefaultTableModel(createDataFromList(), columnTitles) {
private static final long serialVersionUID = -8087121961261738627L;
@Override
public boolean isCellEditable(int row, int column) {
return column == 1;
......
......@@ -7,6 +7,7 @@ import javax.swing.JDialog;
* DIbuggerPopUp.
*/
class DIbuggerPopUp extends JDialog {
private static final long serialVersionUID = 2997815514917283750L;
/**
* Constructor for a DIbuggerPopUp.
......
......@@ -11,6 +11,7 @@ import javax.swing.*;
* something that caused an Error but can be handled by the Logic itself.
*/
public class DecisionPopUp extends DIbuggerPopUp {
private static final long serialVersionUID = 5877809615863448456L;
private static String YES_OPTION = "Ja";
private static String NO_OPTION = "Nein";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment