🏡 index : ~doyle/blockbuster.git

author Jordan Doyle <jordan.doyle@outlook.com> 2015-04-13 2:27:12.0 +01:00:00
committer Jordan Doyle <jordan.doyle@outlook.com> 2015-04-13 2:27:12.0 +01:00:00
commit
85f81bb5b20aad438b464597d9af506d522f214a [patch]
tree
a3b317e9beb97ccc25212fe34e02e4adc28a4576
parent
3ffee632f0f9b69cc1c43cb9a6abb5a4c2fa05b6
download
85f81bb5b20aad438b464597d9af506d522f214a.tar.gz

JRE8 Compliance & remove classes



Diff

 .classpath                                                              |  2 +-
 target/classes/log4j2.xml                                               | 27 ---------------------------
 target/classes/data/cd_&_dvd_data_1.txt                                 | 25 -------------------------
 target/classes/data/cd_&_dvd_data_2.txt                                 | 23 -----------------------
 target/classes/data/cd_&_dvd_data_3.txt                                 | 26 --------------------------
 target/classes/data/cd_data.txt                                         | 17 -----------------
 target/classes/data/items_all.txt                                       | 41 -----------------------------------------
 target/classes/wf/doyle/blockbuster/App.class                           |  0 
 target/test-classes/wf/doyle/blockbuster/AppTest.class                  |  0 
 target/classes/wf/doyle/blockbuster/file/FileReader.class               |  0 
 target/classes/wf/doyle/blockbuster/file/FileWriter$1.class             |  0 
 target/classes/wf/doyle/blockbuster/file/FileWriter.class               |  0 
 target/classes/wf/doyle/blockbuster/gui/GUI$1.class                     |  0 
 target/classes/wf/doyle/blockbuster/gui/GUI.class                       |  0 
 target/classes/wf/doyle/blockbuster/item/AudioVisualItem.class          |  0 
 target/classes/wf/doyle/blockbuster/item/LibraryItem.class              |  0 
 target/classes/wf/doyle/blockbuster/item/PrintedItem.class              |  0 
 target/classes/wf/doyle/blockbuster/util/EnumLineType.class             |  0 
 target/classes/wf/doyle/blockbuster/util/Library$1.class                |  0 
 target/classes/wf/doyle/blockbuster/util/Library.class                  |  0 
 target/classes/wf/doyle/blockbuster/util/User.class                     |  0 
 src/main/java/wf/doyle/blockbuster/gui/GUI.java                         | 11 +++--------
 src/main/java/wf/doyle/blockbuster/util/Library.java                    | 10 +++-------
 target/classes/wf/doyle/blockbuster/item/items/audiovisual/CD.class     |  0 
 target/classes/wf/doyle/blockbuster/item/items/audiovisual/DVD.class    |  0 
 target/classes/wf/doyle/blockbuster/item/items/printed/Book.class       |  0 
 target/classes/wf/doyle/blockbuster/item/items/printed/Periodical.class |  0 
 27 files changed, 7 insertions(+), 175 deletions(-)

diff --git a/.classpath b/.classpath
index 9c865fb..af1430b 100644
--- a/.classpath
+++ a/.classpath
@@ -12,7 +12,7 @@
			<attribute name="maven.pomderived" value="true"/>
		</attributes>
	</classpathentry>
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
		<attributes>
			<attribute name="maven.pomderived" value="true"/>
		</attributes>
diff --git a/target/classes/log4j2.xml b/target/classes/log4j2.xml
deleted file mode 100644
index 47187c2..0000000 100644
--- a/target/classes/log4j2.xml
+++ /dev/null
@@ -1,27 +1,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="WARN">
	<Appenders>
		<Console name="Console" target="SYSTEM_OUT">
			<PatternLayout pattern="[%d{HH:mm:ss}] [%logger{36}] [%replace{%-5level}{\s}{}] %msg%n"/>
		</Console>
		
		<RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
			<PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />

			<Policies>
				<TimeBasedTriggeringPolicy />
				<OnStartupTriggeringPolicy />
			</Policies>
		</RollingRandomAccessFile>
	</Appenders>
	
	<Loggers>
		<Root level="info">
			<AppenderRef ref="File"/>
		</Root>
		
		<Root level="debug">
			<AppenderRef ref="Console"/>
		</Root>
	</Loggers>
</Configuration>
diff --git a/target/classes/data/cd_&_dvd_data_1.txt b/target/classes/data/cd_&_dvd_data_1.txt
deleted file mode 100644
index 4f42816..0000000 100644
--- a/target/classes/data/cd_&_dvd_data_1.txt
+++ /dev/null
@@ -1,25 +1,0 @@
// this is a comment, any lines that start with //
// (and blank lines) should be ignored

[CD data]

// data is artist, noOfTracks, playingTime, title, itemCode, cost

James Blunt,15,68, Back to Bedlam, LM003604,498
Duffy,10,73, Rockferry, LM003553,898
Adele,12,19,75, LM003580,798
Robert Plant and Alison Krauss,13,72, Raising Sand, LM003750,898
Goldfrapp,10,72, Seventh Tree, LM003873,1299
Amy Winehouse,11,70, Back To Black, LM003698,698
Jack Johnson,15,67, Sleep Through The Static, LM003773,898
 Mark Ronson,14,74, Version, LM003365,698, 
Radiohead,10,75, In Rainbows , LM003771,798,
Nick Cave,11,68, Dig!!! Lazarus Dig!!!, LM003751,1199
Nickelback,11,72, All the Right Reasons, LM003915,598

[DVD data]

// data is director, playingTime, title, itemCode, cost

Chris Miller,92, Shrek The Third, LM004314,1026
Robert Zemeckis,114, Beowulf , LM004079,900
diff --git a/target/classes/data/cd_&_dvd_data_2.txt b/target/classes/data/cd_&_dvd_data_2.txt
deleted file mode 100644
index 99a0676..0000000 100644
--- a/target/classes/data/cd_&_dvd_data_2.txt
+++ /dev/null
@@ -1,23 +1,0 @@
[DVD data]
// none available yet

[CD data]
// data is artist, noOfTracks, playingTime, title, itemCode, cost
Goldfrapp,10,72, Seventh Tree, LM003873,1299
Amy Winehouse,11,70, Back To Black, LM003698,698
Jack Johnson, 15,67, Sleep Through The Static, LM003773,898

[DVD data]
// data is director, playingTime, title, itemCode, cost
Chris Miller,92, Shrek The Third, LM004314,1026
Robert Zemeckis,114, Beowulf , LM004079,900
Phyllida Lloyd,118,  Mamma Mia, LM004984,798
Joe Wright,130, Atonement, LM004720,1293
Andrew Adamson,125, The Chronicles of Narnia: Prince Caspian, LM004178,498

[cd data]
// data is artist, noOfTracks, playingTime, title, itemCode, cost 
Mark Ronson,14,75, Version, LM003365,698
Radiohead,10,74, In Rainbows , LM003771,798
Nick Cave,11,68, Dig!!! Lazarus Dig!!!, LM003751,1199
Nickelback, 11,68, All the Right Reasons, LM003915,598
diff --git a/target/classes/data/cd_&_dvd_data_3.txt b/target/classes/data/cd_&_dvd_data_3.txt
deleted file mode 100644
index 9ac436b..0000000 100644
--- a/target/classes/data/cd_&_dvd_data_3.txt
+++ /dev/null
@@ -1,26 +1,0 @@
// this is a comment, any lines that start with //
// (and blank lines) should be ignored

[CD data]

// data is artist, noOfTracks, playingTime, title, itemCode, cost, timesBorrowed, onLoan

James Blunt,15,68, Back to Bedlam, LM003604,498,234,true
Duffy,10,73, Rockferry, LM003553,898,90,false
Adele,12,19,75, LM003580,798,87,FALSE
Robert Plant and Alison Krauss,13,72, Raising Sand, LM003750,898,89,tRUE
Goldfrapp,10,72, Seventh Tree, LM003873,1299,9876,true
Amy Winehouse,11,70, Back To Black, LM003698,698,8765,false
Jack Johnson,15,67, Sleep Through The Static, LM003773,898, 54,True
 Mark Ronson, 14,74, Version, LM003365,698,56,true 
Radiohead,10,75, In Rainbows , LM003771,798,6543,FALSE
Nick Cave,11,68, Dig!!! Lazarus Dig!!!, LM003751,1199,90,False
Nickelback,11,72, All the Right Reasons, LM003915,598,32,true

[DVD data]

// data is director, playingTime, title, itemCode, cost, timesBorrowed, onLoan


Chris Miller,92, Shrek The Third, LM004314,1026,900,TRUE 
Robert Zemeckis,114, Beowulf , LM004079,900,87,FALSE
diff --git a/target/classes/data/cd_data.txt b/target/classes/data/cd_data.txt
deleted file mode 100644
index bfe2c67..0000000 100644
--- a/target/classes/data/cd_data.txt
+++ /dev/null
@@ -1,17 +1,0 @@
// this is a comment, any lines that start with //
// (and blank lines) should be ignored


// data is artist, noOfTracks, playingTime, title, itemCode, cost

James Blunt,15,68, Back to Bedlam, LM003604,498
Duffy,10,73, Rockferry, LM003553,898
Adele,12,19,75, LM003580,798
Robert Plant and Alison Krauss,13,72, Raising Sand, LM003750,898
Goldfrapp,10,72, Seventh Tree, LM003873,1299
Amy Winehouse,11,70, Back To Black, LM003698,698
Jack Johnson,15,67, Sleep Through The Static, LM003773,898
 Mark Ronson,14,74, Version, LM003365,698, 
Radiohead,10,75, In Rainbows , LM003771,798,
Nick Cave,11,68, Dig!!! Lazarus Dig!!!, LM003751,1199
Nickelback,11,72, All the Right Reasons, LM003915,598
diff --git a/target/classes/data/items_all.txt b/target/classes/data/items_all.txt
deleted file mode 100644
index 52b503c..0000000 100644
--- a/target/classes/data/items_all.txt
+++ /dev/null
@@ -1,41 +1,0 @@
// this is a comment, any lines that start with //
// (and blank lines) should be ignored

[Book data]
// data is author, isbn, noOfPages, publisher, title, itemCode, cost, timesBorrowed, onLoan
Barnes and Kolling, 9780131976290,480, Pearson, Objects First with Java, LM002411,3989,781,true
Aho Sethi and Ullman, 9780201101942,795, Addison-Wesley, Compilers: Principles Techniques and Tools, LM002711,599,0,FALSE
Harvey Paul and Jeffrey, 9780130622211,1568, Prentice Hall, C# How to Program, LM002876,4599,45,TRUE
Muster, 9780072193145,1011, McGraw-Hill, Unix Made Easy: The Basics and Beyond (Made Easy), LM002468,6395,0,TRUE
Thomee, 9783540331216,370, Springer Verlag, Galerkin Finite Element Methods for Parabolic Problems, LM002153,4554,0,FALSE

[CD data]

// data is artist, noOfTracks, playingTime, title, itemCode, cost, timesBorrowed, onLoan

James Blunt,15,68, Back to Bedlam, LM003604,498,234,true
Duffy,10,73, Rockferry, LM003553,898,90,false
Adele,12,19,75, LM003580,798,87,FALSE
Robert Plant and Alison Krauss,13,72, Raising Sand, LM003750,898,89,tRUE
Goldfrapp,10,72, Seventh Tree, LM003873,1299,9876,true
Amy Winehouse,11,70, Back To Black, LM003698,698,8765,false
Jack Johnson,15,67, Sleep Through The Static, LM003773,898,54,True
 Mark Ronson,14,74, Version, LM003365,698,56,true 
Radiohead,10,75, In Rainbows , LM003771,798,6543,FALSE
Nick Cave,11,68, Dig!!! Lazarus Dig!!!, LM003751,1199,90,False
Nickelback,11,72, All the Right Reasons, LM003915,598,32,true

[DVD data]

// data is director, playingTime, title, itemCode, cost, timesBorrowed, onLoan
Chris Miller,92, Shrek The Third, LM004314,1026,900,TRUE 
Robert Zemeckis,114, Beowulf , LM004079,900,87,FALSE
Phyllida Lloyd,118,  Mamma Mia, LM004984,798,566,true
Joe Wright,130, Atonement, LM004720,1293,66,true
Andrew Adamson,125, The Chronicles of Narnia: Prince Caspian, LM004178,345,45,FALSE

[periodical data]
// data is publicationDate, noOfPages, publisher, title, itemCode, cost, timesBorrowed, onLoan
25-03-08,70, News International, The Times, LM005447,80,0,FALSE
26-03-08,70, News International, The Times, LM005002,80,0,false
26-03-08,60, Associated Newspapers, Daily Mail, LM005177,40,0,false
diff --git a/target/classes/wf/doyle/blockbuster/App.class b/target/classes/wf/doyle/blockbuster/App.class
deleted file mode 100644
index 4d461358dfe49cc134a9c9082c768e8dd2a014c1..0000000000000000000000000000000000000000 100644
Binary files a/target/classes/wf/doyle/blockbuster/App.class and /dev/null differdiff --git a/target/test-classes/wf/doyle/blockbuster/AppTest.class b/target/test-classes/wf/doyle/blockbuster/AppTest.class
deleted file mode 100644
index 14ede6b745cd4eeda99cbeab4cd4dfdd60d29e86..0000000000000000000000000000000000000000 100644
Binary files a/target/test-classes/wf/doyle/blockbuster/AppTest.class and /dev/null differdiff --git a/target/classes/wf/doyle/blockbuster/file/FileReader.class b/target/classes/wf/doyle/blockbuster/file/FileReader.class
deleted file mode 100644
index f180e102877e32249e118b6c73cf98882aa52be6..0000000000000000000000000000000000000000 100644
Binary files a/target/classes/wf/doyle/blockbuster/file/FileReader.class and /dev/null differdiff --git a/target/classes/wf/doyle/blockbuster/file/FileWriter$1.class b/target/classes/wf/doyle/blockbuster/file/FileWriter$1.class
deleted file mode 100644
index da88445a41fdd6bc015e9467149c747f93eed437..0000000000000000000000000000000000000000 100644
Binary files a/target/classes/wf/doyle/blockbuster/file/FileWriter$1.class and /dev/null differdiff --git a/target/classes/wf/doyle/blockbuster/file/FileWriter.class b/target/classes/wf/doyle/blockbuster/file/FileWriter.class
deleted file mode 100644
index ae198463f6a7f8587a1610f5cf753e6b385925b8..0000000000000000000000000000000000000000 100644
Binary files a/target/classes/wf/doyle/blockbuster/file/FileWriter.class and /dev/null differdiff --git a/target/classes/wf/doyle/blockbuster/gui/GUI$1.class b/target/classes/wf/doyle/blockbuster/gui/GUI$1.class
deleted file mode 100644
index 25a33c0c0244b0b628b56c3ea86f5dd73140a696..0000000000000000000000000000000000000000 100644
Binary files a/target/classes/wf/doyle/blockbuster/gui/GUI$1.class and /dev/null differdiff --git a/target/classes/wf/doyle/blockbuster/gui/GUI.class b/target/classes/wf/doyle/blockbuster/gui/GUI.class
deleted file mode 100644
index 80e94225674aace7f996a2857403efe2d9a6bfd6..0000000000000000000000000000000000000000 100644
Binary files a/target/classes/wf/doyle/blockbuster/gui/GUI.class and /dev/null differdiff --git a/target/classes/wf/doyle/blockbuster/item/AudioVisualItem.class b/target/classes/wf/doyle/blockbuster/item/AudioVisualItem.class
deleted file mode 100644
index 4bb422bd3de19060659d3b9f8089090061c70653..0000000000000000000000000000000000000000 100644
Binary files a/target/classes/wf/doyle/blockbuster/item/AudioVisualItem.class and /dev/null differdiff --git a/target/classes/wf/doyle/blockbuster/item/LibraryItem.class b/target/classes/wf/doyle/blockbuster/item/LibraryItem.class
deleted file mode 100644
index 72c11edb93e7228689d686031f41b07ebf5205b7..0000000000000000000000000000000000000000 100644
Binary files a/target/classes/wf/doyle/blockbuster/item/LibraryItem.class and /dev/null differdiff --git a/target/classes/wf/doyle/blockbuster/item/PrintedItem.class b/target/classes/wf/doyle/blockbuster/item/PrintedItem.class
deleted file mode 100644
index 31b9cc5c44a5fb4a040a602f50bf3105d7e5721c..0000000000000000000000000000000000000000 100644
Binary files a/target/classes/wf/doyle/blockbuster/item/PrintedItem.class and /dev/null differdiff --git a/target/classes/wf/doyle/blockbuster/util/EnumLineType.class b/target/classes/wf/doyle/blockbuster/util/EnumLineType.class
deleted file mode 100644
index 50fa4ae3b797ff61d8feae913e04ec8e5ec54c21..0000000000000000000000000000000000000000 100644
Binary files a/target/classes/wf/doyle/blockbuster/util/EnumLineType.class and /dev/null differdiff --git a/target/classes/wf/doyle/blockbuster/util/Library$1.class b/target/classes/wf/doyle/blockbuster/util/Library$1.class
deleted file mode 100644
index 0d5875ba38890bb836e1a510eed8d00d8204fabe..0000000000000000000000000000000000000000 100644
Binary files a/target/classes/wf/doyle/blockbuster/util/Library$1.class and /dev/null differdiff --git a/target/classes/wf/doyle/blockbuster/util/Library.class b/target/classes/wf/doyle/blockbuster/util/Library.class
deleted file mode 100644
index bc3ca9db99b72c2d24ffd4f9929020a322525905..0000000000000000000000000000000000000000 100644
Binary files a/target/classes/wf/doyle/blockbuster/util/Library.class and /dev/null differdiff --git a/target/classes/wf/doyle/blockbuster/util/User.class b/target/classes/wf/doyle/blockbuster/util/User.class
deleted file mode 100644
index 6869af328afca9866a8225082a43b387d1d09485..0000000000000000000000000000000000000000 100644
Binary files a/target/classes/wf/doyle/blockbuster/util/User.class and /dev/null differdiff --git a/src/main/java/wf/doyle/blockbuster/gui/GUI.java b/src/main/java/wf/doyle/blockbuster/gui/GUI.java
index 3d60d79..e030e83 100644
--- a/src/main/java/wf/doyle/blockbuster/gui/GUI.java
+++ a/src/main/java/wf/doyle/blockbuster/gui/GUI.java
@@ -69,13 +69,8 @@
		this.contentPane.add(this.tabbedPane);

		List<LibraryItem> items = App.items;
		Collections.sort(items, new Comparator<LibraryItem>()
		{
			@Override
			public int compare(LibraryItem arg0, LibraryItem arg1)
			{
				return arg0.getType().toString().compareTo(arg1.getType().toString());
			}
		Collections.sort(items, (arg0, arg1) -> {
			return arg0.getType().toString().compareTo(arg1.getType().toString());
		});

		EnumLineType header = null;
@@ -139,7 +134,7 @@
				}
			}
			
			btnNewButton.addActionListener((e)-> {
			btnNewButton.addActionListener((e) -> {
				if(!App.USER.hasItem() && item.toggleItem())
				{	
					if(borrow)
diff --git a/src/main/java/wf/doyle/blockbuster/util/Library.java b/src/main/java/wf/doyle/blockbuster/util/Library.java
index c5ab61a..995f9cf 100644
--- a/src/main/java/wf/doyle/blockbuster/util/Library.java
+++ a/src/main/java/wf/doyle/blockbuster/util/Library.java
@@ -73,13 +73,9 @@
	public void printAllDetailsSortedOnTitle() // who picks the method names for
	{                                          // these tasks..?
		List<LibraryItem> items = App.items;
		Collections.sort(items, new Comparator<LibraryItem>()
		{
			@Override
			public int compare(LibraryItem arg0, LibraryItem arg1)
			{
				return arg0.getName().compareTo(arg1.getName());
			}
		
		Collections.sort(items, (arg0, arg1) -> {
			return arg0.getName().compareTo(arg1.getName());
		});

		App.LOGGER.debug("SORTED DETAILS TEST");
diff --git a/target/classes/wf/doyle/blockbuster/item/items/audiovisual/CD.class b/target/classes/wf/doyle/blockbuster/item/items/audiovisual/CD.class
deleted file mode 100644
index 7c29b4d94cdd032c8c208d5482beb004568debd1..0000000000000000000000000000000000000000 100644
Binary files a/target/classes/wf/doyle/blockbuster/item/items/audiovisual/CD.class and /dev/null differdiff --git a/target/classes/wf/doyle/blockbuster/item/items/audiovisual/DVD.class b/target/classes/wf/doyle/blockbuster/item/items/audiovisual/DVD.class
deleted file mode 100644
index bc127e3023176d05b29a3966dc401cfbd16e72fd..0000000000000000000000000000000000000000 100644
Binary files a/target/classes/wf/doyle/blockbuster/item/items/audiovisual/DVD.class and /dev/null differdiff --git a/target/classes/wf/doyle/blockbuster/item/items/printed/Book.class b/target/classes/wf/doyle/blockbuster/item/items/printed/Book.class
deleted file mode 100644
index 54e3675a55817c6bb414cbec9b298313fa8979c9..0000000000000000000000000000000000000000 100644
Binary files a/target/classes/wf/doyle/blockbuster/item/items/printed/Book.class and /dev/null differdiff --git a/target/classes/wf/doyle/blockbuster/item/items/printed/Periodical.class b/target/classes/wf/doyle/blockbuster/item/items/printed/Periodical.class
deleted file mode 100644
index 4856c3efd8db924563dee62bb49be9e9a2760b8c..0000000000000000000000000000000000000000 100644
Binary files a/target/classes/wf/doyle/blockbuster/item/items/printed/Periodical.class and /dev/null differ