Skip to content

GitLab

Commit dcd2876e authored by Jakob Schöttl's avatar Jakob Schöttl
Browse files
Options

Refactor ClassFinder

parent 332e49d6
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 58 deletions
VadereGui/src/org/vadere/gui/projectview/utils/ClassFinder.java
View file @ dcd2876e
package org.vadere.gui.projectview.utils;
import org.vadere.simulator.models.MainModel;
import org.vadere.simulator.models.Model;
import org.vadere.simulator.projects.dataprocessing_mtp.OutputFile;
import org.vadere.simulator.projects.dataprocessing_mtp.Processor;
import org.vadere.state.attributes.Attributes;
import org.vadere.state.attributes.models.AttributesOSM;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Modifier;
......@@ -14,11 +7,16 @@ import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Enumeration;
import java.util.List;
import java.util.stream.Collectors;
import org.vadere.simulator.models.MainModel;
import org.vadere.simulator.models.Model;
import org.vadere.simulator.projects.dataprocessing_mtp.Processor;
import org.vadere.state.attributes.Attributes;
import org.vadere.state.attributes.models.AttributesOSM;
public class ClassFinder {
public static List<String> getAttributesNames() {
......@@ -39,28 +37,26 @@ public class ClassFinder {
}
// all output file classes
public static List<Class<? extends OutputFile>> getOutputFileClasses() {
List<Class<? extends OutputFile>> classList = null;
public static List<Class<?>> getOutputFileClasses() {
try {
Class<? extends OutputFile>[] classes = getClasses(Processor.class.getPackage().getName());
classList = Arrays.stream(classes)
// TODO use findSubclassesInPackage and get rid of the try/catch in this method
List<Class<?>> classes = getClasses(Processor.class.getPackage().getName()); // TODO why Processor's and not OutputFile's package?
return classes.stream()
.filter(c -> c.getSimpleName().endsWith("File") && !Modifier.isAbstract(c.getModifiers()))
.collect(Collectors.toList());
} catch (ClassNotFoundException | IOException e) {
e.printStackTrace();
}
return classList;
// TODO better return empty list, it's simpler to handle from the UI
return null;
}
public static List<Class<? extends Processor>> getProcessorClasses(Type keyType) {
List<Class<? extends Processor>> procs = null;
public static List<Class<?>> getProcessorClasses(Type keyType) {
try {
Class<? extends Processor>[] classes = getClasses(Processor.class.getPackage().getName());
procs = Arrays.stream(classes)
// TODO use findSubclassesInPackage and get rid of the try/catch in this method
List<Class<?>> classes = getClasses(Processor.class.getPackage().getName());
return classes.stream()
.filter(c -> {
String name = c.getSimpleName();
return name.endsWith("Processor") && !name.startsWith("Attributes") && !Modifier.isAbstract(c.getModifiers());
......@@ -71,32 +67,33 @@ public class ClassFinder {
e.printStackTrace();
}
return procs;
// TODO better return empty list, it's simpler to handle from the UI
return null;
}
private static List<String> getClassNamesWithTagInPackage(String packageName, Class<?> baseClassOrInterface) {
return findSubclassesInPackage(packageName, baseClassOrInterface).stream()
.map(Class::getName)
.collect(Collectors.toList());
}
private static List<String> getClassNamesWithTagInPackage(String packageName, Class classTag) {
List<String> classNames = new ArrayList<>();
private static List<Class<?>> findSubclassesInPackage(String packageName, Class<?> baseClassOrInterface) {
try {
for (Class cls : getClasses(packageName)) {
if (!cls.isInterface() && classTag.isAssignableFrom(cls)) {
String name = cls.getName();
if (isNotAnInnerClass(name)) {
classNames.add(name);
}
}
}
return getClasses(packageName).stream()
.filter(c -> !c.isInterface()
&& baseClassOrInterface.isAssignableFrom(c)
&& isNotAnInnerClass(c))
.collect(Collectors.toList());
} catch (ClassNotFoundException | IOException e) {
e.printStackTrace();
}
return classNames;
return new ArrayList<>();
}
private static boolean isNotAnInnerClass(String name) {
return !name.contains("$");
private static boolean isNotAnInnerClass(Class<?> clazz) {
return !clazz.getName().contains("$");
}
// below via https://dzone.com/articles/get-all-classes-within-package
/**
......@@ -108,7 +105,7 @@ public class ClassFinder {
* @throws ClassNotFoundException
* @throws IOException
*/
private static Class[] getClasses(String packageName) throws ClassNotFoundException, IOException {
private static List<Class<?>> getClasses(String packageName) throws ClassNotFoundException, IOException {
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
assert classLoader != null;
String path = packageName.replace('.', '/');
......@@ -118,11 +115,11 @@ public class ClassFinder {
URL resource = resources.nextElement();
dirs.add(new File(resource.getFile()));
}
ArrayList<Class> classes = new ArrayList<>();
ArrayList<Class<?>> classes = new ArrayList<>();
for (File directory : dirs) {
classes.addAll(findClasses(directory, packageName));
}
return classes.toArray(new Class[classes.size()]);
return classes;
}
/**
......@@ -133,8 +130,8 @@ public class ClassFinder {
* @return The classes
* @throws ClassNotFoundException
*/
private static List<Class> findClasses(File directory, String packageName) throws ClassNotFoundException {
List<Class> classes = new ArrayList<>();
private static List<Class<?>> findClasses(File directory, String packageName) throws ClassNotFoundException {
List<Class<?>> classes = new ArrayList<>();
if (!directory.exists()) {
return classes;
}
......@@ -151,8 +148,8 @@ public class ClassFinder {
return classes;
}
private static ParameterizedType findGenericProcessorSuperclass(Class<? extends Processor> c) {
Class superclass = c;
private static ParameterizedType findGenericProcessorSuperclass(Class<?> c) {
Class<?> superclass = c;
while (!superclass.equals(Object.class)) {
if(superclass.getSuperclass().equals(Processor.class))
......
VadereGui/src/org/vadere/gui/projectview/view/ScenarioJPanel.java
View file @ dcd2876e
package org.vadere.gui.projectview.view;
import java.awt.BorderLayout;
import java.awt.CardLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ItemEvent;
import java.beans.IntrospectionException;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.ParameterizedType;
import java.util.ArrayList;
import java.util.List;
import javax.swing.AbstractAction;
import javax.swing.BoxLayout;
import javax.swing.JComboBox;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JMenu;
import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
import javax.swing.SwingConstants;
import javax.swing.border.EmptyBorder;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.vadere.gui.components.utils.Messages;
......@@ -12,24 +37,10 @@ import org.vadere.gui.topographycreator.view.TopographyWindow;
import org.vadere.simulator.projects.ProjectFinishedListener;
import org.vadere.simulator.projects.ScenarioRunManager;
import org.vadere.simulator.projects.VadereProject;
import org.vadere.simulator.projects.dataprocessing_mtp.OutputFile;
import org.vadere.simulator.projects.io.JsonConverter;
import org.vadere.state.scenario.Topography;
import org.vadere.util.io.IOUtils;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ItemEvent;
import java.beans.IntrospectionException;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.ParameterizedType;
import java.util.ArrayList;
import java.util.List;
import javax.swing.*;
import javax.swing.border.EmptyBorder;
public class ScenarioJPanel extends JPanel implements IProjectChangeListener, ProjectFinishedListener {
......@@ -214,7 +225,7 @@ public class ScenarioJPanel extends JPanel implements IProjectChangeListener, Pr
.forEach(procclass -> panel.add(new JLabel("- " + procclass.getSimpleName())));
});
List<Class<? extends OutputFile>> classes = ClassFinder.getOutputFileClasses();
List<Class<?>> classes = ClassFinder.getOutputFileClasses();
JComboBox<Class> cbOutputTypes = new JComboBox<>(classes.toArray(new Class[classes.size()]));
cbOutputTypes.setRenderer(new ClassRenderer());
panel.add(cbOutputTypes);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment