-
Notifications
You must be signed in to change notification settings - Fork 272
/
.gitignore.orig
295 lines (294 loc) · 16.2 KB
/
.gitignore.orig
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
*.class
# Package Files #
*.jar
*.war
*.ear
/Lesson-01/HelloWorld/nbproject/private/
/Lesson-01/HelloWorld/build/
/Lesson-01/SayHello/nbproject/private/
/Lesson-01/SayHello/build/
/Lesson-01/InteractiveHello/nbproject/private/
/Lesson-01/InteractiveHello/build/
/Lesson-02/PrimitiveTypes/nbproject/private/
/Lesson-02/CommonDataTypes/nbproject/private/
/Lesson-02/CommonDataTypes/build/
/Lesson-02/InteractiveCommonDataTypes/nbproject/private/
/Lesson-02/InteractiveCommonDataTypes/build/
/Lesson-01/PrintingPower/nbproject/private/
/Lesson-01/PrintingPower/build/
/Lesson-01/DebugThis-JavaWTFJavaFTW/nbproject/private/
/Lesson-01/DebugThis-JavaWTFJavaFTW/build/
/Lesson-01/ChallengeActivityI-TickTacToeBoard/nbproject/private/
/Lesson-01/ChallengeActivityII-TickTacToeBoardSampleGame/nbproject/private/
/Lesson-01/SOLUTIONS/ChallengeActivityI-TickTacToeBoard/build/
/Lesson-01/SOLUTIONS/ChallengeActivityII-TickTacToeBoardSampleGame/build/
/Lesson-02/BasicOperators/nbproject/private/
/Lesson-02/BasicOperators/build/
/Lesson-02/InteractiveCommonDataTypes/dist/
/Lesson-02/SOLUTIONS/UnitConversionFtToIn/nbproject/private/
/Lesson-02/SOLUTIONS/UnitConversionFtToIn/build/
/Lesson-02/SOLUTIONS/AreaAndPerimeterOfARectangle/nbproject/private/
/Lesson-01/ChallengeActivityI-TickTacToeBoard/build/
/Lesson-02/SOLUTIONS/DebugThisUnitConversionFtToIn/nbproject/private/
/Lesson-02/SOLUTIONS/ChallengeActivityI-AreaAndPerimeterOfARectangle/nbproject/private/
/Lesson-02/SOLUTIONS/ChallengeActivityI-AreaAndPerimeterOfARectangle/build/
/Lesson-02/SOLUTIONS/FinalGradeInMET100/nbproject/private/
/Lesson-02/SOLUTIONS/ChallengeActivityII-FinalGradeInMET100/nbproject/private/
/Lesson-02/SOLUTIONS/ChallengeActivityII-FinalGradeInMET100/build/
/Lesson-03/RelationalQualityConditionalOperators/nbproject/private/
/Lesson-03/RelationalEqualityConditionalOperators/nbproject/private/
/Lesson-03/RelationalEqualityConditionalOperators/build/
/Lesson-03/UnderstandingTypeCasting/nbproject/private/
/Lesson-03/UnderstandingTypeCasting/build/
/Lesson-03/OnePlusTwoEqualsTwelve/nbproject/private/
/Lesson-03/OnePlusTwoEqualsTwelve/build/
/Lesson-03/SOLUTIONS/OddOrEven/nbproject/private/
/Lesson-03/SOLUTIONS/OddOrEven/build/
/Lesson-03/SOLUTIONS/DebugThis-OddOrEven/nbproject/private/
/Lesson-03/DebugThis-OddOrEven/nbproject/private/
/Lesson-03/SOLUTIONS/AreaOfATriangle/nbproject/private/
/Lesson-03/SOLUTIONS/AreaOfATriangle/build/
/Lesson-03/SOLUTIONS/ChallengeActivityI-AreaOfATriangle/nbproject/private/
/Lesson-03/ChallengeActivityI-AreaOfATriangle/nbproject/private/
/Lesson-03/SOLUTIONS/DegreesOfATriangle/nbproject/private/
/Lesson-03/SOLUTIONS/ChallengeActivityII-DegreesOfATriangle/nbproject/private/
/Lesson-03/SOLUTIONS/ChallengeActivityII-DegreesOfATriangle/build/
/Lesson-03/ChallengeActivityII-DegreesOfATriangle/build/
/Lesson-03/ChallengeActivityII-DegreesOfATriangle/nbproject/private/
/Lesson-03/UsingClassesExampleRandom/nbproject/private/
/Lesson-03/UsingClassesExampleRandom/build/
/Lesson-03/StringBuilderExample/nbproject/private/
/Lesson-03/RandomExample/nbproject/private/
/Lesson-03/StringBuilderExample/build/
/Lesson-03/MathExample/nbproject/private/
/Lesson-03/MathExample/build/
/Lesson-04/SOLUTIONS/GuessMyNumber/nbproject/private/
/Lesson-04/SOLUTIONS/DebugThis-GuessMyNumber/nbproject/private/
/Lesson-04/SOLUTIONS/DebugThis-GuessMyNumber/build/
/Lesson-04/SOLUTIONS/PalindromeDetector/nbproject/private/
/Lesson-04/SOLUTIONS/ChallengeActivityI-PalindromeDetector/nbproject/private/
/Lesson-04/SOLUTIONS/ChallengeActivityI-PalindromeDetector/build/
/Lesson-04/SOLUTIONS/FinalGradeInMET100v2/nbproject/private/
/Lesson-04/SOLUTIONS/FinalGradeInMET100v2/build/
/Lesson-04/SOLUTIONS/ChallengeActivityII-FinalGradeInMET100v2/nbproject/private/
/Lesson-04/SOLUTIONS/FunctionBasics/nbproject/private/
/Lesson-04/SOLUTIONS/FunctionBasics/build/
/Lesson-05/Factorial/nbproject/private/
/Lesson-05/Factorial/build/
/Lesson-05/SOLUTIONS/BigLetters/nbproject/private/
/Lesson-05/SOLUTIONS/BigLetters/build/
/Lesson-05/SOLUTIONS/ChallengeActivityI-BigLetters/nbproject/private/
/Lesson-05/SOLUTIONS/Triangles/nbproject/private/
/Lesson-05/SOLUTIONS/Circles/nbproject/private/
/Lesson-05/SOLUTIONS/Circles/build/
/Lesson-05/SOLUTIONS/DebugThis-Circles/nbproject/private/
/Lesson-05/SOLUTIONS/RollTheDice/nbproject/private/
/Lesson-05/SOLUTIONS/RollTheDice/build/
/Lesson-04/RandomExample/build/
/Lesson-05/SOLUTIONS/ChallengeActivityII-RollTheDice/nbproject/private/
/Lesson-06/NSidedDice/nbproject/private/
/Lesson-06/NSidedDice/build/
/Lesson-06/SOLUTIONS/EZTipCalc/nbproject/private/
/Lesson-06/SOLUTIONS/EZTipCalc/build/
/Lesson-06/SOLUTIONS/CircleClass/nbproject/private/
/Lesson-06/SOLUTIONS/CircleClass/build/
/Lesson-06/SOLUTIONS/MET100Gradesv3/nbproject/private/
/Lesson-06/SOLUTIONS/MET100Gradesv3/build/
/Lesson-06/SOLUTIONS/ChallengeActivityI-CircleClass/nbproject/private/
/Lesson-06/SOLUTIONS/ChallengeActivityII-MET100Gradesv3/nbproject/private/
/Lesson-06/SOLUTIONS/DebugThis-EZTipCalc/nbproject/private/
/Lesson-07/PlayingCards/nbproject/private/
/Lesson-07/PlayingCardsExample/nbproject/private/
/Lesson-07/PlayingCardsExample/build/
/Lesson-07/SOLUTIONS/ChallengeActivityII-PlayingCardsExample/nbproject/private/
/Lesson-07/SOLUTIONS/ChallengeActivityII-PlayingCardsExample/build/
/Lesson-07/ChallengeActivityII-PlayingCardsExample/build/
/Lesson-07/ChallengeActivityII-PlayingCardsExample/nbproject/private/
/Lesson-07/SOLUTIONS/RectangleClass/nbproject/private/
/Lesson-07/SOLUTIONS/RectangleClass/build/
/Lesson-07/SOLUTIONS/DebugThis-RectangleClass/nbproject/private/
/Lesson-07/SOLUTIONS/DebugThis-RectangleClass/build/
/Lesson-07/SOLUTIONS/ChallengeActivityI-RectangleClassTests/nbproject/private/
/Lesson-07/SOLUTIONS/ChallengeActivityI-RectangleClassTests/build/
/Lesson-02/SOLUTIONS/Solution-DebugThisUnitConversionFtToIn/nbproject/private/
/Lesson-02/SOLUTIONS/Solution-ChallengeActivityII-FinalGradeInMET100/nbproject/private/
/Lesson-02/SOLUTIONS/Solution-ChallengeActivityI-AreaAndPerimeterOfARectangle/nbproject/private/
/Lesson-03/SOLUTIONS/Solution-DebugThis-OddOrEven/nbproject/private/
/Lesson-03/SOLUTIONS/Solution-ChallengeActivityII-DegreesOfATriangle/nbproject/private/
/Lesson-03/SOLUTIONS/Solution-ChallengeActivityI-AreaOfATriangle/nbproject/private/
/Lesson-04/SOLUTIONS/Solution-DebugThis-GuessMyNumber/nbproject/private/
/Lesson-04/SOLUTIONS/Solution-ChallengeActivityI-PalindromeDetector/nbproject/private/
/Lesson-04/SOLUTIONS/Solution-ChallengeActivityII-FinalGradeInMET100v2/nbproject/private/
/Lesson-05/SOLUTIONS/Solution-DebugThis-Circles/nbproject/private/
/Lesson-05/SOLUTIONS/Solution-ChallengeActivityII-RollTheDice/nbproject/private/
/Lesson-05/SOLUTIONS/Solution-ChallengeActivityI-BigLetters/nbproject/private/
/Lesson-06/SOLUTIONS/Solution-DebugThis-EZTipCalc/nbproject/private/
/Lesson-06/SOLUTIONS/Solution-ChallengeActivityII-MET100Gradesv3/nbproject/private/
/Lesson-06/SOLUTIONS/Solution-ChallengeActivityI-CircleClass/nbproject/private/
/Lesson-07/SOLUTIONS/Solution-DebugThis-RectangleClass/nbproject/private/
/Lesson-07/SOLUTIONS/Solution-ChallengeActivityI-RectangleClassTests/nbproject/private/
/Lesson-07/SOLUTIONS/Solution-ChallengeActivityII-PlayingCardsExample/nbproject/private/
/Lesson-08/IfElseStatement/nbproject/private/
/Lesson-08/IfElseStatement/build/
/Lesson-08/DungeonHack/nbproject/private/
/Lesson-08/DungeonHack/build/
/Lesson-08/SOLUTIONS/Solution-DebugThis-DungeonHackCriticalHit/nbproject/private/
/Lesson-08/DebugThis-DungeonHackCriticalHit/nbproject/private/
/Lesson-08/SOLUTIONS/Solution-DebugThis-DungeonHackCriticalHit/build/
/Other/RockPaperScissors/nbproject/private/
/Other/PlayingCards/nbproject/private/
/Lesson-08/SOLUTIONS/Solution-ChallengeActivityII-PlayingCardsExample/nbproject/private/
/Lesson-08/SOLUTIONS/Solution-ChallengeActivityI-PlayingCardsComparison/nbproject/private/
/Lesson-08/SOLUTIONS/Solution-ChallengeActivityII-DungeonHackMonsterTurn/nbproject/private/
/Lesson-08/SOLUTIONS/Solution-ChallengeActivityII-DungeonHackMonsterTurn/build/
/Lesson-08/ChallengeActivityI-PlayingCardsComparison/nbproject/private/
/Lesson-08/ChallengeActivityI-PlayingCardsComparison/build/
/Lesson-08/ChallengeActivityII-DungeonHackMonsterTurn/nbproject/private/
/Lesson-08/ChallengeActivityII-DungeonHackMonsterTurn/build/
/Lesson-08/SOLUTIONS/Solution-ChallengeActivityI-PlayingCardsComparison/build/
/Lesson-09/SOLUTIONS/Solution-ChallengeActivityI-LetterGrade/nbproject/private/
/Lesson-09/SOLUTIONS/Solution-ChallengeActivityI-LetterGrade/build/
/Other/RockPaperScissors/build/
/Lesson-09/SwitchStatementAndIfElseLadder/nbproject/private/
/Lesson-09/SwitchStatementAndIfElseLadder/build/
/Lesson-09/SOLUTIONS/Solution-DebugThis-SalesTaxCalculations/nbproject/private/
/Lesson-09/SOLUTIONS/Solution-DebugThis-SalesTaxCalculations/build/
/Lesson-09/DebugThis-SalesTaxCalculations/nbproject/private/
/Lesson-09/ChallengeActivityI-LetterGrade/nbproject/private/
/Lesson-09/SOLUTIONS/Solution-ChallengeActivityII-RockPaperScissors/nbproject/private/
/Lesson-09/Enumerations/nbproject/private/
/Lesson-09/Enumerations/build/
/Lesson-09/SOLUTIONS/Solution-ChallengeActivityII-LetterGradeEnums/JavaApplication22/nbproject/private/
/Lesson-09/SOLUTIONS/Solution-ChallengeActivityII-LetterGradeEnums/nbproject/private/
/Lesson-09/SOLUTIONS/Solution-ChallengeActivityII-LetterGradeEnums/build/
/Lesson-09/ChallengeActivityII-LetterGradeEnums/nbproject/private/
/Lesson-10/ForLoopExamples/nbproject/private/
/Lesson-10/ForLoopExamples/build/
/Lesson-10/99BottlesOfBeerOnTheWall/nbproject/private/
/Lesson-10/ForLoopBasics/nbproject/private/
/Lesson-10/ForLoopBasics/build/
/Lesson-10/NestedForLoops/nbproject/private/
/Lesson-10/NestedForLoops/build/
/Lesson-10/MultiplesofN/nbproject/private/
/Lesson-10/MultiplesofN/build/
/Lesson-10/SOLUTIONS/Solution-DebugThis-PrintBarChart/nbproject/private/
/Lesson-10/SOLUTIONS/Solution-DebugThis-PrintBarChart/build/
/Lesson-10/SOLUTIONS/Solution-ChallengeActivityI-PrintBarChart/nbproject/private/
/Lesson-10/SOLUTIONS/Solution-DebugThis-MultiplicationTable/nbproject/private/
/Lesson-10/SOLUTIONS/Solution-DebugThis-MultiplicationTable/build/
/Lesson-10/SOLUTIONS/Solution-ChallengeActivityII-NSidedDiceV2/nbproject/private/
/Lesson-10/SOLUTIONS/Solution-ChallengeActivityII-NSidedDiceV2/build/
/Lesson-10/DebugThis-MultiplicationTable/nbproject/private/
/Lesson-10/ChallengeActivityI-PrintBarChart/nbproject/private/
/Lesson-10/ChallengeActivityII-NSidedDiceV2/nbproject/private/
/Lesson-11/WhileLoopExample/nbproject/private/
/Lesson-11/WhileLoopBasics/nbproject/private/
/Lesson-11/WhileLoopBasics/build/
/Lesson-11/PreTestLoopExampleGuessANumber/nbproject/private/
/Lesson-11/PreTestLoopExampleGuessANumber/build/
/Lesson-11/GuessANumber-PostTestLoop/nbproject/private/
/Lesson-11/GuessANumber-PreTestLoop/nbproject/private/
/Lesson-11/GuessANumber-PostTestLoop/build/
/Lesson-11/GuessANumber-PreTestLoop/build/
/Lesson-11/GuessANumber-MidTestLoop/nbproject/private/
/Lesson-11/GuessANumber-MidTestLoop/build/
/Lesson-11/SOLUTIONS/DebugThis-QuizAverage/nbproject/private/
/Lesson-11/SOLUTIONS/DebugThis-QuizAverage/build/
/Lesson-11/SOLUTIONS/ChallengeActivityI-QuizAverageDropLowest/nbproject/private/
/Lesson-11/SOLUTIONS/ChallengeActivityI-QuizAverageDropLowest/build/
/Lesson-11/SOLUTIONS/Solution-DebugThis-QuizAverage/nbproject/private/
/Lesson-11/SOLUTIONS/Solution-ChallengeActivityI-QuizAverageDropLowest/nbproject/private/
/Lesson-11/SOLUTIONS/Solution-ChallengeActivityII-DungeonHackCombat/nbproject/private/
/Lesson-11/SOLUTIONS/Solution-ChallengeActivityII-DungeonHackCombat/build/
/Lesson-11/ChallengeActivityII-DungeonHackCombat/nbproject/private/
/Lesson-11/ChallengeActivityII-DungeonHackCombat/build/
/Lesson-11/DebugThis-QuizAverage_1/nbproject/private/
/Lesson-11/DebugThis-QuizAverage/nbproject/private/
/Lesson-11/DebugThis-QuizAverage/build/
/Lesson-11/ChallengeActivityI-QuizAverageDropLowest/nbproject/private/
/Lesson-11/ChallengeActivityI-QuizAverageDropLowest/build/
/Lesson-12/SOLUTIONS/Solution-ChallengeActivityII-English2Yoda/nbproject/private/
/Lesson-12/SOLUTIONS/Solution-ChallengeActivityII-English2Yoda/build/
/Lesson-12/ArrayBasics/nbproject/private/
/Lesson-12/ArrayBasics/build/
/Lesson-12/ArraysOfObjects/nbproject/private/
/Lesson-12/ArraysOfObjects/build/
/Lesson-12/SOLUTIONS/Solution-DebugThis-TestScores/nbproject/private/
/Lesson-12/SOLUTIONS/Solution-DebugThis-TestScores/build/
/Lesson-12/DebugThis-TestScores/nbproject/private/
/Lesson-12/ChallengeActivityII-English2Yoda/nbproject/private/
/Lesson-12/SOLUTIONS/Solution-ChallengeActivityI-ASCIIBarChartv2/nbproject/private/
/Lesson-12/SOLUTIONS/Solution-ChallengeActivityI-ASCIIBarChartv2/build/
/Lesson-12/ChallengeActivityI-ASCIIBarChartv2/nbproject/private/
/Lesson-13/MultiDimensionalArraysExample/nbproject/private/
/Lesson-13/MultiDimensionalArraysExample/build/
/Lesson-13/SOLUTIONS/DebugThis-DrawTicTacToeBoard/nbproject/private/
/Lesson-13/SOLUTIONS/Solution-DebugThis-DrawTicTacToeBoard/nbproject/private/
/Lesson-13/SOLUTIONS/Solution-DebugThis-DrawTicTacToeBoard/build/
/Lesson-13/SOLUTIONS/Solution-ChallengeActivityI-TicTacToeBoardWinner/nbproject/private/
/Lesson-13/SOLUTIONS/Solution-ChallengeActivityI-TicTacToeBoardWinner/build/
/Lesson-13/SOLUTIONS/Solution-ChallengeActivityI-TicTacToeFullGame/nbproject/private/
/Lesson-13/SOLUTIONS/Solution-ChallengeActivityI-TicTacToeFullGame/build/
/Lesson-13/SOLUTIONS/Solution-ChallengeActivityI-TicTacToeFullGame/dist/
/Lesson-13/SOLUTIONS/Solution-ChallengeActivityII-TicTacToeFullGame/nbproject/private/
/Lesson-13/SOLUTIONS/Solution-ChallengeActivityII-TicTacToeFullGame/build/
/Lesson-13/ChallengeActivityII-TicTacToeFullGame/nbproject/private/
/Lesson-13/DebugThis-DrawTicTacToeBoard/nbproject/private/
/Lesson-13/ChallengeActivityI-TicTacToeBoardWinner/nbproject/private/
/Lesson-14/ArrayListExample/nbproject/private/
/Lesson-14/ArrayListExample/build/
/Lesson-14/ArrayListExampleAddRemove/nbproject/private/
/Lesson-14/ArrayListExampleAddRemove/build/
/Lesson-14/DeckOfPlayingCards/nbproject/private/
/Lesson-14/DeckOfPlayingCards/build/
/Lesson-14/Solution-ChallengeActivityI-DeckOfPlayingCards/nbproject/private/
/Lesson-14/ChallengeActivityI-DeckOfPlayingCards/nbproject/private/
/Lesson-14/SOLUTIONS/Solution-DebugThis-PlayingCardsCountTheAces/nbproject/private/
/Lesson-14/ArrayListExampleAddRemoveSwap/nbproject/private/
/Lesson-14/ArrayListExampleAddRemoveSwap/build/
/Lesson-14/SOLUTIONS/Solution-DebugThis-PlayingCardsCountTheAces/build/
/Lesson-14/DebugThis-PlayingCardsCountTheAces/nbproject/private/
/Lesson-14/DebugThis-PlayingCardsCountTheAces/build/
/Lesson-14/SOLUTIONS/Solution-ChallengeActivityII-PlayingCardsHand/nbproject/private/
/Lesson-14/SOLUTIONS/Solution-ChallengeActivityII-PlayingCardsHand/build/
/Lesson-14/ChallengeActivityII-PlayingCardsHand/nbproject/private/
/Lesson-05/VariableScope/nbproject/private/
/Lesson-05/VariableScope/build/
/Lesson-13/ChallengeActivityI-TicTacToeBoardWinner/build/
/Lesson-13/ImplementingTickTacToe/nbproject/private/
/Lesson-15/BasicSortingSearchingDemo/nbproject/private/
/Lesson-15/BasicSortingSearchingDemo/build/
/Lesson-15/SortingSearchingStudentsUsingComparator/nbproject/private/
/Lesson-15/SortingSearchingStudentsUsingComparator/build/
/Lesson-16/SerializableStudent/nbproject/private/
/Lesson-16/BasicFileIO/nbproject/private/
/Lesson-16/BasicFileIO/build/
/Lesson-16/BasicFileIO/dist/
/Lesson-16/ObjectSerialization/nbproject/private/
/Lesson-16/ObjectSerialization/build/
/Lesson-16/ExceptionBasics/nbproject/private/
/Lesson-16/ExceptionBasics/build/
/Lesson-16/ExampleTryCatchFinally/nbproject/private/
/Lesson-16/ExampleTryCatchFinally/build/
/Lesson-18/GUIFormExamples/nbproject/private/
/Lesson-18/GUIFormExamples/build/
/Lesson-18/JavaApplication52/nbproject/private/
/Lesson-18/JavaApplication52/build/
<<<<<<< HEAD
/Lesson-18/DemoSwingControls/nbproject/private/
/Lesson-18/DemoSwingControls/build/
/Lesson-18/EverythingsAString/nbproject/private/
/Lesson-18/EverythingsAString/build/
/Lesson-19/CashRegisterDrawer/nbproject/private/
/Lesson-19/CashRegisterDrawer/build/
/Lesson-19/ProductCatalogDemo/nbproject/private/
/Lesson-19/ProductCatalogDemo/build/
/Lesson-20/TwitterSearchApiDemo/nbproject/private/
/Lesson-20/TwitterSearchApiDemo/build/
=======
/Lesson-18/TemperatureConversion/nbproject/private/
/Lesson-18/TemperatureConversion/build/
/Lesson-16/StudentGui/nbproject/private/
/Lesson-16/StudentGui/build/
/Lesson-16/StudentGui/dist/
>>>>>>> b5aa30c8904579aabb4fea4197195e3802564921