Skip to content

Commit

Permalink
Remove some more classes
Browse files Browse the repository at this point in the history
  • Loading branch information
stuartwdouglas committed Nov 15, 2017
1 parent 15c7cba commit f9e366c
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 242 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@
import org.jboss.metadata.web.spec.ListenerMetaData;
import org.jboss.metadata.web.spec.TagFileMetaData;
import org.jboss.metadata.web.spec.TagMetaData;
import org.jboss.metadata.web.spec.Tld11MetaData;
import org.jboss.metadata.web.spec.Tld12MetaData;
import org.jboss.metadata.web.spec.Tld20MetaData;
import org.jboss.metadata.web.spec.Tld21MetaData;
import org.jboss.metadata.web.spec.TldExtensionMetaData;
import org.jboss.metadata.web.spec.TldMetaData;

Expand Down Expand Up @@ -93,22 +89,7 @@ public static TldMetaData parse(XMLStreamReader reader) throws XMLStreamExceptio
// It is likely an error to not have a version at this point though
version = Version.TLD_2_1;
}
TldMetaData tld = null;
switch (version) {
case TLD_1_1:
tld = new Tld11MetaData();
break;
case TLD_1_2:
tld = new Tld12MetaData();
break;
case TLD_2_0:
tld = new Tld20MetaData();
break;
case TLD_2_1:
tld = new Tld21MetaData();
break;
}

TldMetaData tld = new TldMetaData();
// Handle attributes
final int count = reader.getAttributeCount();
for (int i = 0; i < count; i++) {
Expand Down Expand Up @@ -190,7 +171,7 @@ public static TldMetaData parse(XMLStreamReader reader) throws XMLStreamExceptio
break;
case INFO:
if (version == Version.TLD_1_1) {
((Tld11MetaData) tld).setInfo(getElementText(reader));
getElementText(reader);//ignore
} else if (version == Version.TLD_1_2) {
// Ignore invalid legacy element
getElementText(reader);
Expand All @@ -200,14 +181,14 @@ public static TldMetaData parse(XMLStreamReader reader) throws XMLStreamExceptio
break;
case SMALL_ICON:
if (version == Version.TLD_1_2) {
((Tld12MetaData) tld).setSmallIcon(getElementText(reader));
getElementText(reader);//ignore
} else {
throw unexpectedElement(reader);
}
break;
case LARGE_ICON:
if (version == Version.TLD_1_2) {
((Tld12MetaData) tld).setLargeIcon(getElementText(reader));
getElementText(reader);//ignore
} else {
throw unexpectedElement(reader);
}
Expand Down
67 changes: 0 additions & 67 deletions web/src/main/java/org/jboss/metadata/web/spec/Tld11MetaData.java

This file was deleted.

82 changes: 0 additions & 82 deletions web/src/main/java/org/jboss/metadata/web/spec/Tld12MetaData.java

This file was deleted.

35 changes: 0 additions & 35 deletions web/src/main/java/org/jboss/metadata/web/spec/Tld20MetaData.java

This file was deleted.

35 changes: 0 additions & 35 deletions web/src/main/java/org/jboss/metadata/web/spec/Tld21MetaData.java

This file was deleted.

0 comments on commit f9e366c

Please sign in to comment.