Skip to content

Commit da5d498

Browse files
authored
Merge pull request Sergix#29 from Sergix/dev
Dev
2 parents 0d0e3de + 28494ff commit da5d498

File tree

12 files changed

+86
-27
lines changed

12 files changed

+86
-27
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,5 @@ target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputF
3030
target/
3131
*.lst
3232

33-
*.class
33+
*.class
34+
target/classes/main/java/jterm/Client.class

README.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
[![JTerm](https://sergix.github.io/img/jterm.png)](https://sergix.github.io/projects/jterm/index.html)
22

33
![Build Status](https://travis-ci.org/Sergix/JTerm.svg?branch=master)
4-
[![Code Triagers Badge](https://www.codetriage.com/sergix/jterm/badges/users.svg)](https://www.codetriage.com/sergix/jterm)
4+
[![Code Triagers Badge](https://www.codetriage.com/sergix/jterm/badges/users.svg)](https://www.codetriage.com/sergix/jterm)
5+
6+
[![Stories in Ready](https://badge.waffle.io/Sergix/JTerm.svg?label=ready&title=Ready)](http://waffle.io/Sergix/JTerm)
7+
[![Throughput Graph](https://graphs.waffle.io/Sergix/JTerm/throughput.svg)](https://waffle.io/Sergix/JTerm/metrics/throughput)
58

69
## What is it?
710
A terminal written for cross-platform usage.

changelog.txt

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
(#87)[9/20/2017-22:17 0.5.1 Sergix]
2+
Added Waffle.io throughput graph to the README.
3+
Pushed updates to Git.
4+
5+
(#86)[9/20/2017-22:08 0.5.1 Sergix]
6+
Fixed issue where if "dir" or "files" was entered it crashed the application due to an out of bounds exception.
7+
TODO: update help information for Dir and Files commands.
8+
Pushed updates to Git.
9+
10+
(#85)[9/17/2017-18:07 0.5.1 Sergix]
11+
Updated documentation comments in the source code.
12+
Removed the Process() function from Window and Exec.
13+
Pushed updates to Git.
14+
115
(#84)[9/12/2017-21:26 0.5.1 Sergix]
216
Wrote patch notes and changelog for version "0.5.1".
317
Compiled binaries and source code, as well as the wrapfile (which may be deprecated).

src/main/java/jterm/Echo.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,14 @@ public class Echo
2626
/*
2727
* Echo() void
2828
*
29-
* Constructor for calling Process() function.
29+
* Echo the input to the terminal.
30+
*
31+
* ArrayList<String> options - command options
32+
*
33+
* -h
34+
* Prints help information
35+
* input
36+
* Text to output
3037
*/
3138
public Echo() { }
3239

src/main/java/jterm/Exit.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ public class Exit
2626
/*
2727
* Exit() void
2828
*
29-
* Constructor for calling Process() function.
29+
* Exits the application.
30+
*
31+
* ArrayList<String> options - command options
3032
*/
3133
public Exit() { }
3234

src/main/java/jterm/Files.java

+12-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ public class Files
2929
/*
3030
* Files() void
3131
*
32-
* Constructor for calling Process() function.
32+
* Constructor for calling methods.
33+
*
34+
* ArrayList<String> options - command options
3335
*/
3436
public Files() { }
3537

@@ -83,7 +85,9 @@ public static void Process (String options)
8385
* ArrayList<String> options - command options
8486
*
8587
* -h
86-
* Prints help information
88+
* Prints help information
89+
* filename [...]
90+
* File to write to
8791
*/
8892
public static void WriteFile(ArrayList<String> options)
8993
{
@@ -153,7 +157,9 @@ else if (line.equals(" "))
153157
* ArrayList<String> options - command options
154158
*
155159
* -h
156-
* Prints help information
160+
* Prints help information
161+
* file [...]
162+
* File to delete
157163
*/
158164
public static void Delete(ArrayList<String> options)
159165
{
@@ -198,7 +204,9 @@ public static void Delete(ArrayList<String> options)
198204
* ArrayList<String> options - command options
199205
*
200206
* -h
201-
* Prints help information
207+
* Prints help information
208+
* filename [...]
209+
* Prints the contents of the specified files
202210
*
203211
* Credit to @d4nntheman
204212
*/

src/main/java/jterm/Help.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class Help
2626
/*
2727
* Help() void
2828
*
29-
* Constructor for calling Process() function.
29+
* Prints help information.
3030
*/
3131
public Help() { }
3232

src/main/java/jterm/Pause.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@ public class Pause
99
/*
1010
* Pause() void
1111
*
12-
* Constructor for calling Process() function.
12+
* Pauses the interpreter until the user
13+
* hits the "Enter" key.
14+
*
15+
* ArrayList<String> options - command options
16+
*
17+
* message
18+
* Pause message to be printed
1319
*/
1420
public Pause() { }
1521

src/main/java/jterm/Ping.java

+10-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,16 @@ public class Ping
1616
/*
1717
* Ping() void
1818
*
19-
* Constructor for calling Process() function.
19+
* Pings the specified host.
20+
*
21+
* ArrayList<String> options - command options
22+
23+
* -h
24+
* Prints help information
25+
* host
26+
* Host to ping
27+
* -p port
28+
* Port to ping the host on
2029
*/
2130
public Ping() { }
2231

src/main/java/jterm/Ps.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,13 @@ public class Ps
1717
/*
1818
* Ps() void
1919
*
20-
* Constructor for calling Process() function.
20+
* Prints a list of process running on
21+
* the system.
22+
*
23+
* ArrayList<String> options - command options
24+
*
25+
* -h
26+
* Prints help information
2127
*/
2228
public Ps() { }
2329

src/main/java/jterm/Set.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ public class Set
2929
/*
3030
* Set() void
3131
*
32-
* Constructor for calling Process() function.
32+
* Creates a new variable or prints all
33+
* stored variables.
34+
*
35+
* ArrayList<String> options - command options
3336
*/
3437
public Set() { }
3538

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
c:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Exit.java
2-
c:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Echo.java
3-
c:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Pause.java
4-
c:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Exec.java
5-
c:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Help.java
6-
c:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Dir.java
7-
c:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Window.java
8-
c:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Server.java
9-
c:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Ping.java
10-
c:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Client.java
11-
c:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Files.java
12-
c:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Ps.java
13-
c:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\JTerm.java
14-
c:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Set.java
1+
C:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Exit.java
2+
C:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Echo.java
3+
C:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Pause.java
4+
C:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Exec.java
5+
C:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Help.java
6+
C:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Dir.java
7+
C:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Window.java
8+
C:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Server.java
9+
C:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Ping.java
10+
C:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Client.java
11+
C:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Files.java
12+
C:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Ps.java
13+
C:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\JTerm.java
14+
C:\Users\Sergi\Development\GitHub\JTerm\src\main\java\jterm\Set.java

0 commit comments

Comments
 (0)