Skip to content

Commit e1ba0b5

Browse files
pH-7pH-7
authored
Merge branch 'master' into master
2 parents 5f039ab + f9864a7 commit e1ba0b5

9 files changed

Lines changed: 116 additions & 111 deletions

File tree

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929

3030
- [Ossi Laukkanen](https://github.com/Fitoh)
3131

32+
- [Akashdeep Singh](https://github.com/akashdeepsingh9988)
33+
3234

3335
## CONTACT
3436

‎build.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
<import file="nbproject/build-impl.xml"/>
1313
<!--
1414
15-
There exist several targets which are by default empty and which can be
16-
used for execution of your tasks. These targets are usually executed
17-
before and after some main targets. They are:
15+
There exist several targets which are by default empty and which can be
16+
used for execution of your tasks. These targets are usually executed
17+
before and after some main targets. They are:
1818
1919
-pre-init: called before initialization of project properties
2020
-post-init: called after initialization of project properties
@@ -40,19 +40,19 @@
4040
</obfuscate>
4141
</target>
4242
43-
For list of available properties check the imported
44-
nbproject/build-impl.xml file.
43+
For list of available properties check the imported
44+
nbproject/build-impl.xml file.
4545
4646
4747
Another way to customize the build is by overriding existing main targets.
48-
The targets of interest are:
48+
The targets of interest are:
4949
5050
-init-macrodef-javac: defines macro for javac compilation
5151
-init-macrodef-junit: defines macro for junit execution
5252
-init-macrodef-debug: defines macro for class debugging
5353
-init-macrodef-java: defines macro for class execution
5454
-do-jar: JAR building
55-
run: execution of project
55+
run: execution of project
5656
-javadoc-build: Javadoc generation
5757
test-report: JUnit report generation
5858
@@ -64,10 +64,10 @@
6464
</exec>
6565
</target>
6666
67-
Notice that the overridden target depends on the jar target and not only on
68-
the compile target as the regular run target does. Again, for a list of available
67+
Notice that the overridden target depends on the jar target and not only on
68+
the compile target as the regular run target does. Again, for a list of available
6969
properties which you can use, check the target you are overriding in the
70-
nbproject/build-impl.xml file.
70+
nbproject/build-impl.xml file.
7171
7272
-->
7373
</project>

‎nbproject/build-impl.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ is divided into following sections:
2828
</condition>
2929
</fail>
3030
<target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
31-
<!--
31+
<!--
3232
======================
33-
INITIALIZATION SECTION
33+
INITIALIZATION SECTION
3434
======================
3535
-->
3636
<target name="-pre-init">

‎src/simplejavatexteditor/About.java‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
* @license Apache (http://www.apache.org/licenses/LICENSE-2.0)
1010
* @create 2012-05-04
1111
* @update 2015-09-4
12-
*
13-
*
12+
*
13+
*
1414
* @modifiedby Achintha Gunasekara
1515
* @modweb http://www.achinthagunasekara.com
1616
* @modemail contact@achinthagunasekara.com
@@ -27,46 +27,46 @@ public class About {
2727
private final JPanel panel;
2828
private String contentText;
2929
private final JLabel text;
30-
31-
public About() {
32-
panel = new JPanel(new FlowLayout());
33-
panel.setBorder(BorderFactory.createEmptyBorder(8, 8, 8, 8));
34-
frame = new JFrame();
35-
frame.setVisible(true);
36-
frame.setSize(500,300);
37-
text = new JLabel();
38-
}
39-
40-
public void me() {
41-
frame.setTitle("About Me - " + SimpleJavaTextEditor.NAME);
42-
43-
contentText =
44-
"<html><body><p>" +
45-
"Author: Pierre-Henry Soria<br />" +
46-
"Contact me at: " +
47-
"<a href='mailto:" + SimpleJavaTextEditor.AUTHOR_EMAIL + "?subject=About the NotePad PH Software'>" + SimpleJavaTextEditor.AUTHOR_EMAIL + "</a>" +
30+
31+
public About() {
32+
panel = new JPanel(new FlowLayout());
33+
panel.setBorder(BorderFactory.createEmptyBorder(8, 8, 8, 8));
34+
frame = new JFrame();
35+
frame.setVisible(true);
36+
frame.setSize(500,300);
37+
text = new JLabel();
38+
}
39+
40+
public void me() {
41+
frame.setTitle("About Me - " + SimpleJavaTextEditor.NAME);
42+
43+
contentText =
44+
"<html><body><p>" +
45+
"Author: Pierre-Henry Soria<br />" +
46+
"Contact me at: " +
47+
"<a href='mailto:" + SimpleJavaTextEditor.AUTHOR_EMAIL + "?subject=About the NotePad PH Software'>" + SimpleJavaTextEditor.AUTHOR_EMAIL + "</a>" +
4848
"<br /><br />" +
4949
"Modified By: Achintha Gunasekara<br />" +
5050
"Contact me at: <a href='mailto:" + SimpleJavaTextEditor.EDITOR_EMAIL + "?subject=About the NotePad PH Software'>" + SimpleJavaTextEditor.EDITOR_EMAIL + "</a>" +
51-
"</p></body></html>";
52-
53-
text.setText(contentText);
54-
panel.add(text);
55-
frame.add(panel);
56-
}
57-
58-
public void software() {
59-
frame.setTitle("About Me - " + SimpleJavaTextEditor.NAME);
60-
61-
contentText =
62-
"<html><body><p>" +
63-
"Name: " + SimpleJavaTextEditor.NAME + "<br />" +
64-
"Version: " + SimpleJavaTextEditor.VERSION +
65-
"</p></body></html>";
66-
67-
text.setText(contentText);
68-
panel.add(text);
69-
frame.add(panel);
70-
}
71-
51+
"</p></body></html>";
52+
53+
text.setText(contentText);
54+
panel.add(text);
55+
frame.add(panel);
56+
}
57+
58+
public void software() {
59+
frame.setTitle("About Me - " + SimpleJavaTextEditor.NAME);
60+
61+
contentText =
62+
"<html><body><p>" +
63+
"Name: " + SimpleJavaTextEditor.NAME + "<br />" +
64+
"Version: " + SimpleJavaTextEditor.VERSION +
65+
"</p></body></html>";
66+
67+
text.setText(contentText);
68+
panel.add(text);
69+
frame.add(panel);
70+
}
71+
7272
}

‎src/simplejavatexteditor/AutoComplete.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,21 +105,21 @@ public void insertUpdate(DocumentEvent e) {
105105
//Before checking for a keyword
106106
checkForBracket();
107107

108-
//Get the beginning of the word being typed
108+
//Get the beginning of the word being typed
109109
int start;
110110
for (start = pos; start >= 0; start--) {
111111
if (!Character.isLetter(content.charAt(start))) {
112112
break;
113113
}
114114
}
115115

116-
//Auto complete will start
116+
//Auto complete will start
117117
//after two characters are typed
118118
if (pos - start < 2) {
119119
return;
120120
}
121121

122-
//Search for a match on the word being typed
122+
//Search for a match on the word being typed
123123
//in the keywords ArrayList
124124
String prefix = content.substring(start + 1);
125125
int n = Collections.binarySearch(words, prefix);
@@ -139,7 +139,7 @@ public void insertUpdate(DocumentEvent e) {
139139
}
140140

141141
/**
142-
* Performs a check to see if the last
142+
* Performs a check to see if the last
143143
* key typed was one of the supported
144144
* bracket characters
145145
*/
@@ -176,7 +176,7 @@ private void setKeywords(String keyword) {
176176
}
177177

178178
/**
179-
* Handles the auto complete suggestion
179+
* Handles the auto complete suggestion
180180
* generated when the user is typing a
181181
* word that matches a keyword.
182182
*/
@@ -280,4 +280,5 @@ public void removeUpdate(DocumentEvent e) {
280280
@Override
281281
public void changedUpdate(DocumentEvent e) {
282282
}
283-
}
283+
284+
}

‎src/simplejavatexteditor/FEdit.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
* @license Apache (http://www.apache.org/licenses/LICENSE-2.0)
1010
* @create 2012-05-04
1111
* @update 2015-09-4
12-
*
13-
*
12+
*
13+
*
1414
* @modifiedby Achintha Gunasekara
1515
* @modweb http://www.achinthagunasekara.com
1616
* @modemail contact@achinthagunasekara.com
@@ -22,8 +22,8 @@
2222

2323
public class FEdit {
2424

25-
public static void clear(JTextArea textArea) {
26-
textArea.setText("");
27-
}
28-
25+
public static void clear(JTextArea textArea) {
26+
textArea.setText("");
27+
}
28+
2929
}

0 commit comments

Comments
 (0)