Skip to content

Commit

Permalink
Merge pull request alaashafaee#370 from alaashafaee/CX_Khaled_193_vie…
Browse files Browse the repository at this point in the history
…w_variables_3.7

Pull Request: Fix_CX_Khaled_193_view_variables_3.7
  • Loading branch information
rami-khalil committed Apr 25, 2014
2 parents 60b9427 + 15d4294 commit b64dad2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 1 addition & 3 deletions tutor/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@ GEM
railties (>= 3.2.6, < 5)
thread_safe (~> 0.1)
warden (~> 1.2.3)
dotenv (0.11.0)
dotenv-deployment (= 0.0.1)
dotenv-deployment (0.0.1)
dotenv (0.7.0)
erubis (2.7.0)
execjs (2.0.2)
foreman (0.63.0)
Expand Down
2 changes: 1 addition & 1 deletion tutor/app/assets/stylesheets/solutions.css
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ textarea {
}

.fixed-horizontal {
max-width: 250px;
max-width: 175px;
overflow-x:scroll;
overflow-y:hidden;
}
Expand Down
10 changes: 6 additions & 4 deletions tutor/app/models/debugger.rb
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ def debug
# Author: Mussab ElDash
def get_line
out_stream = buffer_until_complete
puts out_stream
list_of_lines = out_stream.split(/\n+/)
before_last_line = list_of_lines[-2]
/, line=\d+/ =~ before_last_line
Expand Down Expand Up @@ -156,7 +155,6 @@ def self.debug(student_id, problem_id, code, input)
debugger = Debugger.new
class_name = solution.class_file_name
debugging = debugger.start(class_name, input.split(" "))
p debugging
java_file = solution.java_file_name true, true
class_file = solution.class_file_name true, true
File.delete(java_file)
Expand Down Expand Up @@ -192,9 +190,13 @@ def get_value variable
output_buffer1 = buffer_until_complete.split("main").first
input "print " + variable_name
output_buffer2 = buffer_until_complete.split("main").first
result << output_buffer1
unless output_buffer1.match("instance")
result << output_buffer1
end
if output_buffer1 != output_buffer2
result << output_buffer2
unless output_buffer2.match("instance")
result << output_buffer2
end
end
else
result << variable
Expand Down

0 comments on commit b64dad2

Please sign in to comment.