Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Zodt potential mods #106

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Zodt potential mods #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ad54df
attempt to correct circular dependency in PrefSet where the PrefSet c…
Nov 1, 2013
a5564fb
Add Calendar and GregorianCalendar types with ability to specify de-/…
Feb 12, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion simplCore/NIOLoggingServer.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/ecologylabFundamental/ecologylab/oodss/logging/NIOLoggingServer.java"/>
<listEntry value="/ecologylabFundamental/src/ecologylab/oodss/logging/NIOLoggingServer.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="ecologylab.oodss.logging.NIOLoggingServer"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="/logs/ 9999999"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="ecologylabFundamental"/>
Expand Down
2 changes: 1 addition & 1 deletion simplCore/src/ecologylab/appframework/ApplicationEnvironment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ protected static final SimplTypesScope prefsClassArrayToTranslationScope(
Class<? extends Pref<?>>[] customPrefs)
{
// configure the PrefSet translation scope, incorporating custom translations, if any
if (customPrefs == null)
if (customPrefs == null || customPrefs.length == 0)
customPrefs = PrefSetBaseClassProvider.STATIC_INSTANCE.provideClasses();

return SimplTypesScope.get(PrefSet.PREFS_TRANSLATION_SCOPE, customPrefs);
Expand Down
11 changes: 7 additions & 4 deletions simplCore/src/ecologylab/appframework/types/prefs/PrefSetBaseClassProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public class PrefSetBaseClassProvider extends TranslationsClassProvider

protected PrefSetBaseClassProvider()
{
super();
}

/**
Expand All @@ -26,13 +27,15 @@ protected PrefSetBaseClassProvider()
protected Class<? extends Pref<?>>[] specificSuppliedClasses()
{
Class[] prefSetClasses =
{ MetaPref.class, MetaPrefSet.class, MetaPrefBoolean.class, MetaPrefFloat.class,
MetaPrefInt.class, MetaPrefString.class,

Pref.class, PrefSet.class, PrefBoolean.class, PrefDouble.class, PrefFloat.class,
{
Pref.class, PrefBoolean.class, PrefDouble.class, PrefFloat.class,
PrefInt.class, PrefLong.class, PrefString.class, PrefElementState.class, PrefFile.class,
PrefOp.class,

// XXX THIS MAY NOT SOLVE PROBLEMS WITH CUSTOM PREF TRANSLATIONS!
// XXX Putting PrefSet last helps with a circular dependency where PrefSet's ClassDescriptor
// needs the PrefSetBaseClassProvider's list of classes to compute its scope
PrefSet.class
};

return prefSetClasses;
Expand Down
2 changes: 1 addition & 1 deletion simplCore/src/ecologylab/io/XMLFileFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public class XMLFileFilter implements FileFilter
{
static XMLFileFilter singleton;

static XMLFileFilter get()
public static XMLFileFilter get()
{
XMLFileFilter result = singleton;
if (result == null)
Expand Down
Loading