Explicit generic args needed by our dumb build server?

threerings · Jan 6, 2016 · 609b95a · 609b95a
1 parent a37d4e1
commit 609b95a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core/src/main/java/com/threerings/config/swing/ConfigBox.java b/core/src/main/java/com/threerings/config/swing/ConfigBox.java
@@ -134,7 +134,7 @@ protected void updateModel ()
         if (_additionalFilter == null) {
             curFilter = _filter;
         } else {
-            curFilter = Predicates.and(_filter, _additionalFilter.get());
+            curFilter = Predicates.<ManagedConfig>and(_filter, _additionalFilter.get());
         }
         for (ConfigGroup<ManagedConfig> group : _groups) {
             for (ManagedConfig config : Iterables.filter(group.getRawConfigs(), curFilter)) {

diff --git a/core/src/main/java/com/threerings/config/swing/ConfigTreeFilterPanel.java b/core/src/main/java/com/threerings/config/swing/ConfigTreeFilterPanel.java
@@ -119,9 +119,9 @@ protected Predicate<? super ManagedConfig> createFilter ()
         if (_predicates == null) {
             return _filter;
         }
-        Predicate<? super ManagedConfig> combined = Predicates.and(_predicates);
+        Predicate<? super ManagedConfig> combined = Predicates.<ManagedConfig>and(_predicates);
         if (_filter != null) {
-            combined = Predicates.and(_filter, combined);
+            combined = Predicates.<ManagedConfig>and(_filter, combined);
         }
         return combined;
     }