Commit 4f6cf555 authored by rosemaryng's avatar rosemaryng
Browse files

Merge -- solve inconsistence issues, deleted classes just as newest version

parent 3dbd68da
......@@ -2695,9 +2695,6 @@ public class Mediator implements GuiInterface {
JOptionPane.showMessageDialog(null, stationName + " is not located between fork/join. This topology is not allowed.\n",
"Error", JOptionPane.ERROR_MESSAGE);
}
else if ((problemType == ModelChecker.ERROR_PROBLEM) && (problemSubType == ModelChecker.TRANSITION_INVALID_CONDITION_ERROR)) {
showStationParameterPanel(relatedStation, StationParameterPanel.INPUT_SECTION, null);
}
else if ((problemType == ModelChecker.ERROR_PROBLEM) && (problemSubType == ModelChecker.IMPATIENCE_ENABLED_IN_STATION_BETWEEN_FORK_JOIN_ERROR)) {
showStationParameterPanel(relatedStation, StationParameterPanel.INPUT_SECTION, null);
}
......@@ -2711,6 +2708,9 @@ public class Mediator implements GuiInterface {
showStationParameterPanel(relatedStation, StationParameterPanel.INPUT_SECTION, null);
}
}
else if ((problemType == ModelChecker.ERROR_PROBLEM) && (problemSubType == ModelChecker.TRANSITION_INFINITE_ENABLING_DEGREE_ERROR)) {
showStationParameterPanel(relatedStation, StationParameterPanel.INPUT_SECTION, null);
}
// used only in JMVA conversion
else if ((problemType == ModelChecker.WARNING_PROBLEM) && (problemSubType == ModelChecker.BCMP_FCFS_DIFFERENT_SERVICE_STRATEGIES_WARNING)) {
String stationName = model.getStationName(relatedStation);
......
......@@ -405,24 +405,6 @@ public class JModelProblemsWindow extends JDialog {
description, stationKey, null));
}
}
if (mc.isThereClosedClassRoutingError()) {
HashMap<Object, Vector<Object>> temp = mc.getClosedClassesWithRoutingError();
Vector<Object> classKeys = mc.getClassModel().getClassKeys();
for (int i = 0; i < classKeys.size(); i++) {
Object classKey = classKeys.get(i);
String className = mc.getClassModel().getClassName(classKey);
Vector<Object> stationKeys = temp.get(classKey);
if (stationKeys != null) {
for (int j = 0; j < stationKeys.size(); j++) {
Object stationKey = stationKeys.get(j);
String stationName = mc.getStationModel().getStationName(stationKey);
problems.addElement(new ProblemElement(ModelChecker.ERROR_PROBLEM, ModelChecker.CLOSED_CLASS_ROUTING_ERROR,
"<html><div style=\"width:" + DESCRIPTION_HTML_WIDTH + "px;\">" + className + " routed to "
+ stationName + " linked only to sinks.</div></html>", stationKey, classKey));
}
}
}
}
if (mc.isThereInvalidMeasureError()) {
problems.addElement(new ProblemElement(ModelChecker.ERROR_PROBLEM, ModelChecker.INVALID_MEASURE_ERROR,
"<html><div style=\"width:" + DESCRIPTION_HTML_WIDTH + "px;\">Undefined station for performance index.</div></html>", null, null));
......
Supports Markdown
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