Merge pull request #117 from csmith/master

Some work on event formatting.

src/com/dmdirc/ui/messages/EventFormatter.java

@@ -40,6 +40,8 @@ import java.util.Optional;
  */
 public class EventFormatter {
 
+    private static final String ERROR_STRING = "<FormatError>";
+
     private final EventPropertyManager propertyManager;
     private final EventTemplateProvider templateProvider;
 
@@ -73,12 +75,23 @@ public class EventFormatter {
 
         Object target = event;
         for (String part : dataParts) {
-            target = propertyManager.getProperty(target, target.getClass(), part);
+            final Optional<Object> result =
+                    propertyManager.getProperty(target, target.getClass(), part);
+            if (result.isPresent()) {
+                target = result.get();
+            } else {
+                return ERROR_STRING;
+            }
         }
 
         String value = target.toString();
         for (int i = 1; i < functionParts.length; i++) {
-            value = propertyManager.applyFunction(value, functionParts[i]);
+            final Optional<String> result = propertyManager.applyFunction(value, functionParts[i]);
+            if (result.isPresent()) {
+                value = result.get();
+            } else {
+                return ERROR_STRING;
+            }
         }
 
         return value;

src/com/dmdirc/ui/messages/EventPropertyManager.java

@@ -22,15 +22,41 @@
 
 package com.dmdirc.ui.messages;
 
+import com.dmdirc.DMDircMBassador;
+import com.dmdirc.events.UserErrorEvent;
+import com.dmdirc.logger.ErrorLevel;
+
+import java.lang.reflect.Method;
+import java.util.Optional;
+
+import javax.inject.Inject;
+
 public class EventPropertyManager {
 
-    public <S, T> T getProperty(final S object, final Class<? extends S> type,
+    private final DMDircMBassador eventBus;
+
+    @Inject
+    public EventPropertyManager(final DMDircMBassador eventBus) {
+        this.eventBus = eventBus;
+    }
+
+    public <S> Optional<Object> getProperty(final S object, final Class<? extends S> type,
             final String property) {
-        return null;
+        final String methodName = "get" + property.substring(0, 1).toUpperCase()
+                + property.substring(1);
+        try {
+            final Method method = type.getMethod(methodName);
+            return Optional.ofNullable(method.invoke(object));
+        } catch (ReflectiveOperationException ex) {
+            eventBus.publish(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
+                    "Unable to format event: could not retrieve property " + property,
+                    ex.getMessage()));
+        }
+        return Optional.empty();
     }
 
-    public String applyFunction(final String input, final String property) {
-        return null;
+    public Optional<String> applyFunction(final String input, final String function) {
+        return Optional.empty();
     }
 
 }

test/com/dmdirc/ui/messages/EventFormatterTest.java

@@ -53,7 +53,7 @@ public class EventFormatterTest {
         when(templateProvider.getTemplate(ChannelMessageEvent.class))
                 .thenReturn(Optional.ofNullable("Template {{channel}} meep"));
         when(propertyManager.getProperty(messageEvent, ChannelMessageEvent.class, "channel"))
-                .thenReturn("MONKEY");
+                .thenReturn(Optional.of("MONKEY"));
     }
 
     @Test