diff --git a/glade/add-resource-dialog.glade b/glade/add-resource-dialog.glade
index 670d9f0..f58d825 100644
--- a/glade/add-resource-dialog.glade
+++ b/glade/add-resource-dialog.glade
@@ -69,89 +69,12 @@
6
True
- 4
+ 2
2
False
11
9
-
-
- True
- Pre-emptable
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- 1
- 3
- 4
-
-
-
-
-
-
-
- True
- True
- 1
- 0
- True
- GTK_UPDATE_ALWAYS
- False
- False
- 0 0 inf 1 0 0
-
-
- 1
- 2
- 2
- 3
-
-
-
-
-
-
- True
- Availability
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- 1
- 2
- 3
-
-
-
-
-
True
@@ -250,30 +173,6 @@
-
-
-
- True
- True
- GTK_RELIEF_NORMAL
- True
- False
- False
- True
-
-
-
-
-
-
- 1
- 2
- 3
- 4
- fill
-
-
-
0
diff --git a/src/resources_widget.cc b/src/resources_widget.cc
index 8a7d80a..30037ff 100644
--- a/src/resources_widget.cc
+++ b/src/resources_widget.cc
@@ -161,13 +161,10 @@ ResourcesWidget::_on_add_resource()
_add_resource_dialog_glade->get_widget("Name.Entry", name_entry);
_add_resource_dialog_glade->get_widget("Places.Spin", places_spin);
- _add_resource_dialog_glade->get_widget("Availability.Spin", availability_spin);
- _add_resource_dialog_glade->get_widget("Preemptable.Check", preemptable_check);
Simulation::get_instance().get_history().add_resource(name_entry->get_text(),
- preemptable_check->get_active(),
- places_spin->get_value_as_int(),
- availability_spin->get_value_as_int());
+ false,
+ places_spin->get_value_as_int());
}
_add_resource_dialog->hide();
diff --git a/src/testsuite/scheduling-wizards/wizard-assert-fail b/src/testsuite/scheduling-wizards/wizard-assert-fail
index b27bffb..8351668 100644
--- a/src/testsuite/scheduling-wizards/wizard-assert-fail
+++ b/src/testsuite/scheduling-wizards/wizard-assert-fail
@@ -1,9 +1,7 @@
set cpu-policy 3
add resource
forchetta
-false
1
-0
add process
Scuola di Mileto
0
diff --git a/src/testsuite/scheduling-wizards/wizard-block-fail b/src/testsuite/scheduling-wizards/wizard-block-fail
index a93ba05..57ba2c0 100644
--- a/src/testsuite/scheduling-wizards/wizard-block-fail
+++ b/src/testsuite/scheduling-wizards/wizard-block-fail
@@ -1,14 +1,10 @@
set cpu-policy 3
add resource
ashi
-false
2
-0
add resource
forchetta
-false
1
-0
add process
Scuola di Mileto
0
diff --git a/src/testsuite/scheduling-wizards/wizard-complex-test b/src/testsuite/scheduling-wizards/wizard-complex-test
index fc91427..75b0d76 100644
--- a/src/testsuite/scheduling-wizards/wizard-complex-test
+++ b/src/testsuite/scheduling-wizards/wizard-complex-test
@@ -2,21 +2,15 @@ set cpu-policy 2
add resource
forchetta
-false
1
-0
add resource
ashi
-false
2
-0
add resource
dita
-false
10
-0
diff --git a/src/testsuite/scheduling-wizards/wizard-deadlock-test b/src/testsuite/scheduling-wizards/wizard-deadlock-test
index 71d99b3..2ec3127 100644
--- a/src/testsuite/scheduling-wizards/wizard-deadlock-test
+++ b/src/testsuite/scheduling-wizards/wizard-deadlock-test
@@ -6,14 +6,10 @@ configure-cpu-policy
add resource
scythe
-false
1
-0
add resource
sword
-false
1
-0
add process
diff --git a/src/testsuite/scheduling-wizards/wizard-gap-fail b/src/testsuite/scheduling-wizards/wizard-gap-fail
index 9379855..6d59726 100644
--- a/src/testsuite/scheduling-wizards/wizard-gap-fail
+++ b/src/testsuite/scheduling-wizards/wizard-gap-fail
@@ -2,9 +2,7 @@ set cpu-policy 3
add resource
forchetta
-false
1
-0
add process
Pitagorici
diff --git a/src/testsuite/scheduling-wizards/wizard-priority-inversion-porno b/src/testsuite/scheduling-wizards/wizard-priority-inversion-porno
index 9ab8e41..9b2510a 100644
--- a/src/testsuite/scheduling-wizards/wizard-priority-inversion-porno
+++ b/src/testsuite/scheduling-wizards/wizard-priority-inversion-porno
@@ -31,9 +31,7 @@ configure-cpu-policy
add resource
Jenna Jameson
-false
2
-0
add process
"Wet Dreams IV"
diff --git a/src/testsuite/scheduling-wizards/wizard-unblock-test b/src/testsuite/scheduling-wizards/wizard-unblock-test
index 80378ee..853529f 100644
--- a/src/testsuite/scheduling-wizards/wizard-unblock-test
+++ b/src/testsuite/scheduling-wizards/wizard-unblock-test
@@ -6,9 +6,7 @@ configure-cpu-policy
add resource
banana
-false
1
-0
diff --git a/src/text_simulation.cc b/src/text_simulation.cc
index 1f95aa3..2b8b328 100644
--- a/src/text_simulation.cc
+++ b/src/text_simulation.cc
@@ -1053,18 +1053,14 @@ TextSimulation::on_add_resource(const Tokens& arguments)
check_arguments_num(arguments, 0);
CommandParameter name(_("name"), "", "", false, "");
- CommandParameter preemptable(_("pre-emptable?"), false, false, false, false);
CommandParameter places(_("places"), 0, INT_MAX, false, 1);
- CommandParameter availability(_("availability"), 0, INT_MAX, false, 0);
get_parameter(name);
- get_parameter(preemptable);
get_parameter(places);
- get_parameter(availability);
History& h = Simulation::get_instance().get_history();
- h.add_resource(name.value, preemptable.value, places.value, availability.value);
+ h.add_resource(name.value, false, places.value);
}
void