Commit Diff


commit - dd5b15d42d1c234d425ffe08bbc7b49091c2ff0a
commit + 19b764849713c4b05a13efab12e7044149d86956
blob - 088d129fec920b36fcfe192b372c6a9aec879478
blob + 281fe8abb4acae7c0d33f288ea22ef865e2909db
--- MePixel.iml
+++ MePixel.iml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
-  <component name="ModuleRootManager" />
+<module relativePaths="true" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -9,180 +8,11 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="QTJava" level="project" />
-    <orderEntryProperties />
   </component>
   <component name="copyright">
     <Base>
       <setting name="state" value="1" />
     </Base>
-    <LanguageOptions name="$TEMPLATE$">
-      <option name="templateOptions">
-        <value>
-          <option name="block" value="true" />
-          <option name="separateBefore" value="false" />
-          <option name="separateAfter" value="false" />
-          <option name="prefixLines" value="true" />
-          <option name="lenBefore" value="80" />
-          <option name="lenAfter" value="80" />
-          <option name="box" value="false" />
-          <option name="filler" value=" " />
-        </value>
-      </option>
-      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
-      <option name="keyword" value="Copyright" />
-      <option name="fileTypeOverride" value="4" />
-      <option name="relativeBefore" value="true" />
-      <option name="addBlankAfter" value="true" />
-      <option name="fileLocation" value="1" />
-      <option name="useAlternate" value="false" />
-    </LanguageOptions>
-    <LanguageOptions name="CSS">
-      <option name="templateOptions">
-        <value>
-          <option name="block" value="true" />
-          <option name="separateBefore" value="false" />
-          <option name="separateAfter" value="false" />
-          <option name="prefixLines" value="true" />
-          <option name="lenBefore" value="80" />
-          <option name="lenAfter" value="80" />
-          <option name="box" value="false" />
-          <option name="filler" value=" " />
-        </value>
-      </option>
-      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
-      <option name="keyword" value="Copyright" />
-      <option name="fileTypeOverride" value="2" />
-      <option name="relativeBefore" value="true" />
-      <option name="addBlankAfter" value="true" />
-      <option name="fileLocation" value="1" />
-      <option name="useAlternate" value="false" />
-    </LanguageOptions>
-    <LanguageOptions name="HTML">
-      <option name="templateOptions">
-        <value>
-          <option name="block" value="true" />
-          <option name="separateBefore" value="false" />
-          <option name="separateAfter" value="false" />
-          <option name="prefixLines" value="true" />
-          <option name="lenBefore" value="80" />
-          <option name="lenAfter" value="80" />
-          <option name="box" value="false" />
-          <option name="filler" value=" " />
-        </value>
-      </option>
-      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
-      <option name="keyword" value="Copyright" />
-      <option name="fileTypeOverride" value="2" />
-      <option name="relativeBefore" value="true" />
-      <option name="addBlankAfter" value="true" />
-      <option name="fileLocation" value="1" />
-      <option name="useAlternate" value="false" />
-    </LanguageOptions>
-    <LanguageOptions name="JAVA">
-      <option name="templateOptions">
-        <value>
-          <option name="block" value="true" />
-          <option name="separateBefore" value="false" />
-          <option name="separateAfter" value="false" />
-          <option name="prefixLines" value="true" />
-          <option name="lenBefore" value="80" />
-          <option name="lenAfter" value="80" />
-          <option name="box" value="false" />
-          <option name="filler" value=" " />
-        </value>
-      </option>
-      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
-      <option name="keyword" value="Copyright" />
-      <option name="fileTypeOverride" value="2" />
-      <option name="relativeBefore" value="true" />
-      <option name="addBlankAfter" value="true" />
-      <option name="fileLocation" value="1" />
-      <option name="useAlternate" value="false" />
-    </LanguageOptions>
-    <LanguageOptions name="JSP">
-      <option name="templateOptions">
-        <value>
-          <option name="block" value="true" />
-          <option name="separateBefore" value="false" />
-          <option name="separateAfter" value="false" />
-          <option name="prefixLines" value="true" />
-          <option name="lenBefore" value="80" />
-          <option name="lenAfter" value="80" />
-          <option name="box" value="false" />
-          <option name="filler" value=" " />
-        </value>
-      </option>
-      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
-      <option name="keyword" value="Copyright" />
-      <option name="fileTypeOverride" value="2" />
-      <option name="relativeBefore" value="true" />
-      <option name="addBlankAfter" value="true" />
-      <option name="fileLocation" value="1" />
-      <option name="useAlternate" value="false" />
-    </LanguageOptions>
-    <LanguageOptions name="JavaScript">
-      <option name="templateOptions">
-        <value>
-          <option name="block" value="true" />
-          <option name="separateBefore" value="false" />
-          <option name="separateAfter" value="false" />
-          <option name="prefixLines" value="true" />
-          <option name="lenBefore" value="80" />
-          <option name="lenAfter" value="80" />
-          <option name="box" value="false" />
-          <option name="filler" value=" " />
-        </value>
-      </option>
-      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
-      <option name="keyword" value="Copyright" />
-      <option name="fileTypeOverride" value="2" />
-      <option name="relativeBefore" value="true" />
-      <option name="addBlankAfter" value="true" />
-      <option name="fileLocation" value="1" />
-      <option name="useAlternate" value="false" />
-    </LanguageOptions>
-    <LanguageOptions name="Properties">
-      <option name="templateOptions">
-        <value>
-          <option name="block" value="true" />
-          <option name="separateBefore" value="false" />
-          <option name="separateAfter" value="false" />
-          <option name="prefixLines" value="true" />
-          <option name="lenBefore" value="80" />
-          <option name="lenAfter" value="80" />
-          <option name="box" value="false" />
-          <option name="filler" value=" " />
-        </value>
-      </option>
-      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
-      <option name="keyword" value="Copyright" />
-      <option name="fileTypeOverride" value="2" />
-      <option name="relativeBefore" value="true" />
-      <option name="addBlankAfter" value="true" />
-      <option name="fileLocation" value="1" />
-      <option name="useAlternate" value="false" />
-    </LanguageOptions>
-    <LanguageOptions name="XML">
-      <option name="templateOptions">
-        <value>
-          <option name="block" value="true" />
-          <option name="separateBefore" value="false" />
-          <option name="separateAfter" value="false" />
-          <option name="prefixLines" value="true" />
-          <option name="lenBefore" value="80" />
-          <option name="lenAfter" value="80" />
-          <option name="box" value="false" />
-          <option name="filler" value=" " />
-        </value>
-      </option>
-      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
-      <option name="keyword" value="Copyright" />
-      <option name="fileTypeOverride" value="2" />
-      <option name="relativeBefore" value="true" />
-      <option name="addBlankAfter" value="true" />
-      <option name="fileLocation" value="1" />
-      <option name="useAlternate" value="false" />
-    </LanguageOptions>
   </component>
 </module>
 
blob - ba22d4400f61b1fa1eb1b649c1fe3df77ac5c42c
blob + 9fde4773701a4eced1618f1d8a8e257c530c9ff2
--- MePixel.ipr
+++ MePixel.ipr
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project version="4" relativePaths="false">
+<project relativePaths="false" version="4">
   <component name="AntConfiguration">
     <defaultAnt bundledAnt="true" />
     <buildFile url="file://$PROJECT_DIR$/build.xml">
@@ -7,6 +7,7 @@
       <antReference projectDefault="true" />
       <customJdkName value="" />
       <maximumHeapSize value="128" />
+      <maximumStackSize value="32" />
       <properties />
     </buildFile>
   </component>
@@ -40,11 +41,12 @@
       <entry name="?*.tld" />
     </wildcardResourcePatterns>
   </component>
-  <component name="DataSourceManagerImpl" />
   <component name="DependenciesAnalyzeManager">
     <option name="myForwardDirection" value="false" />
   </component>
-  <component name="DependencyValidationManager" />
+  <component name="DependencyValidationManager">
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </component>
   <component name="EclipseCompilerSettings">
     <option name="DEBUGGING_INFO" value="true" />
     <option name="GENERATE_NO_WARNINGS" value="true" />
@@ -59,15 +61,15 @@
     <option name="ADDITIONAL_OPTIONS_STRING" value="" />
     <option name="MAXIMUM_HEAP_SIZE" value="128" />
   </component>
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
   <component name="EntryPointsManager">
-    <entry_points />
+    <entry_points version="2.0" />
   </component>
   <component name="ExportToHTMLSettings">
     <option name="PRINT_LINE_NUMBERS" value="false" />
     <option name="OPEN_IN_BROWSER" value="false" />
     <option name="OUTPUT_DIRECTORY" />
   </component>
-  <component name="GUI Designer component loader factory" />
   <component name="IdProvider" IDEtalkID="4FF91B3BC232865E3B6D8FE6D556D82A" />
   <component name="InspectionProjectProfileManager">
     <option name="PROJECT_PROFILE" value="Project Default" />
@@ -77,26 +79,9 @@
       <profile version="1.0" is_locked="false">
         <option name="myName" value="Project Default" />
         <option name="myLocal" value="false" />
-        <used_levels>
-          <error>
-            <option name="myName" value="ERROR" />
-            <option name="myVal" value="400" />
-          </error>
-          <warning>
-            <option name="myName" value="WARNING" />
-            <option name="myVal" value="300" />
-          </warning>
-          <information>
-            <option name="myName" value="INFO" />
-            <option name="myVal" value="200" />
-          </information>
-          <server>
-            <option name="myName" value="SERVER PROBLEM" />
-            <option name="myVal" value="100" />
-          </server>
-        </used_levels>
       </profile>
     </profiles>
+    <list size="0" />
   </component>
   <component name="JavacSettings">
     <option name="DEBUGGING_INFO" value="true" />
@@ -283,15 +268,25 @@
       </item>
     </group>
   </component>
+  <component name="ProjectDetails">
+    <option name="projectName" value="MePixel" />
+  </component>
+  <component name="ProjectFileVersion" converted="true" />
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/MePixel.iml" filepath="$PROJECT_DIR$/MePixel.iml" />
     </modules>
   </component>
-  <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/classes" />
   </component>
-  <component name="ProjectRunConfigurationManager" />
+  <component name="ResourceManagerContainer">
+    <option name="myResourceBundles">
+      <value>
+        <list size="0" />
+      </value>
+    </option>
+  </component>
   <component name="RmicSettings">
     <option name="IS_EANABLED" value="false" />
     <option name="DEBUGGING_INFO" value="true" />
@@ -299,8 +294,13 @@
     <option name="GENERATE_IIOP_STUBS" value="false" />
     <option name="ADDITIONAL_OPTIONS_STRING" value="" />
   </component>
-  <component name="StarteamVcsAdapter" />
-  <component name="VssVcs" />
+  <component name="SvnBranchConfigurationManager">
+    <option name="myVersion" value="124" />
+  </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="svn" />
+  </component>
+  <component name="WebServicesPlugin" addRequiredLibraries="true" />
   <component name="com.intellij.jsf.UserDefinedFacesConfigs">
     <option name="USER_DEFINED_CONFIGS">
       <value>
@@ -490,11 +490,5 @@
       <SOURCES />
     </library>
   </component>
-  <component name="uidesigner-configuration">
-    <option name="INSTRUMENT_CLASSES" value="true" />
-    <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" />
-    <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" />
-  </component>
-  <UsedPathMacros />
 </project>
 
blob - 5351f0b50c42a6e0ad2537eeb811bf12ff7bd10d
blob + aff9383990aa4b7bd06b59bf851662cf82933aa2
--- MePixel.iws
+++ MePixel.iws
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project version="4" relativePaths="false">
-  <component name="BookmarkManager" />
+<project relativePaths="false" version="4">
+  <component name="CCaseConfig">
+    <option name="checkoutReserved" value="false" />
+    <option name="markExternalChangeAsUpToDate" value="true" />
+    <option name="checkInUseHijack" value="true" />
+    <option name="useUcmModel" value="true" />
+    <option name="isOffline" value="false" />
+    <option name="synchOutside" value="false" />
+    <option name="isHistoryResticted" value="true" />
+    <option name="useIdenticalSwitch" value="true" />
+    <option name="synchActivitiesOnRefresh" value="true" />
+    <option name="lastScr" value="" />
+    <option name="scrTextFileName" value="" />
+    <option name="historyRevisionsNumber" value="4" />
+  </component>
   <component name="ChangeBrowserSettings">
     <option name="MAIN_SPLITTER_PROPORTION" value="0.3" />
     <option name="MESSAGES_SPLITTER_PROPORTION" value="0.8" />
@@ -16,34 +29,26 @@
     <option name="USER" value="" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/thinkberg/mepixel/CameraGrabberThread.java" afterPath="$PROJECT_DIR$/src/com/thinkberg/mepixel/CameraGrabberThread.java" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/src/com/thinkberg/launcher" afterPath="" />
+    <list default="true" readonly="true" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/thinkberg/mepixel/MePixelLauncher.java" afterPath="$PROJECT_DIR$/src/com/thinkberg/mepixel/MePixelLauncher.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/thinkberg/mepixel/MePixel.java" afterPath="$PROJECT_DIR$/src/com/thinkberg/mepixel/MePixel.java" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/src/com/thinkberg/mepixel/CharDisplay.java" afterPath="" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/MePixel.ipr" afterPath="$PROJECT_DIR$/MePixel.ipr" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/MePixel.iws" afterPath="$PROJECT_DIR$/MePixel.iws" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/src/com/thinkberg/launcher/Launcher.java" afterPath="" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/com/thinkberg/mepixel/BufferedDisplay.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/thinkberg/mepixel/BufferedDisplay.java" afterPath="$PROJECT_DIR$/src/com/thinkberg/mepixel/BufferedDisplay.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/MePixel.iml" afterPath="$PROJECT_DIR$/MePixel.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/thinkberg/mepixel/CameraGrabberThread.java" afterPath="$PROJECT_DIR$/src/com/thinkberg/mepixel/CameraGrabberThread.java" />
     </list>
   </component>
-  <component name="ChangeListSynchronizer" />
-  <component name="ChangesViewManager" flattened_view="true" />
-  <component name="CheckinPanelState" />
+  <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
   <component name="Commander">
     <leftPanel />
     <rightPanel />
     <splitter proportion="0.5" />
   </component>
-  <component name="CompilerWorkspaceConfiguration">
-    <option name="COMPILE_IN_BACKGROUND" value="false" />
-    <option name="AUTO_SHOW_ERRORS_IN_EDITOR" value="true" />
-    <option name="CLOSE_MESSAGE_VIEW_IF_SUCCESS" value="true" />
-    <option name="COMPILE_DEPENDENT_FILES" value="false" />
-    <option name="CLEAR_OUTPUT_DIRECTORY" value="false" />
-    <option name="ASSERT_NOT_NULL" value="true" />
+  <component name="CreatePatchCommitExecutor">
+    <option name="PATCH_PATH" value="" />
+    <option name="REVERSE_PATCH" value="false" />
   </component>
-  <component name="CoverageDataManager" />
   <component name="Cvs2Configuration">
     <option name="PRUNE_EMPTY_DIRECTORIES" value="true" />
     <option name="MERGING_MODE" value="0" />
@@ -100,9 +105,9 @@
         <option name="NOTIFY_CAUGHT" value="true" />
         <option name="NOTIFY_UNCAUGHT" value="true" />
         <option name="ENABLED" value="false" />
-        <option name="SUSPEND_POLICY" value="SuspendAll" />
         <option name="LOG_ENABLED" value="false" />
         <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
         <option name="COUNT_FILTER_ENABLED" value="false" />
         <option name="COUNT_FILTER" value="0" />
         <option name="CONDITION_ENABLED" value="false" />
@@ -115,9 +120,9 @@
         <option name="NOTIFY_CAUGHT" value="true" />
         <option name="NOTIFY_UNCAUGHT" value="true" />
         <option name="ENABLED" value="false" />
-        <option name="SUSPEND_POLICY" value="SuspendAll" />
         <option name="LOG_ENABLED" value="false" />
         <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
         <option name="COUNT_FILTER_ENABLED" value="false" />
         <option name="COUNT_FILTER" value="0" />
         <option name="CONDITION_ENABLED" value="false" />
@@ -130,10 +135,6 @@
     <breakpoint_rules />
     <ui_properties />
   </component>
-  <component name="ErrorTreeViewConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="HIDE_WARNINGS" value="false" />
-  </component>
   <component name="FavoritesManager">
     <favorites_list name="MePixel" />
   </component>
@@ -149,11 +150,34 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
+      <file leaf-file-name="BufferedDisplay.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/thinkberg/mepixel/BufferedDisplay.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="16" column="6" selection-start="357" selection-end="357" vertical-scroll-proportion="0.0">
+              <folding>
+                <marker date="1226491490000" expanded="true" signature="502:743" placeholder="{...}" />
+                <marker date="1226491490000" expanded="true" signature="790:961" placeholder="{...}" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/build.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="37" column="34" selection-start="1264" selection-end="1264" vertical-scroll-proportion="-7.105263">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="MePixel.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/com/thinkberg/mepixel/MePixel.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="21" column="3" selection-start="614" selection-end="614" vertical-scroll-proportion="0.17532468">
-              <folding />
+            <state line="121" column="8" selection-start="4725" selection-end="4725" vertical-scroll-proportion="0.0">
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -161,21 +185,12 @@
       <file leaf-file-name="MePixelLauncher.java" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/com/thinkberg/mepixel/MePixelLauncher.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="36" column="0" selection-start="1166" selection-end="1166" vertical-scroll-proportion="0.2353896">
+            <state line="31" column="33" selection-start="1012" selection-end="1012" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="BufferedDisplay.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/thinkberg/mepixel/BufferedDisplay.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="18" column="13" selection-start="431" selection-end="431" vertical-scroll-proportion="0.2282092">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FindManager">
@@ -188,25 +203,10 @@
     <option name="SORT_ALPHABETICALLY" value="false" />
     <option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" />
   </component>
-  <component name="InspectionManager">
-    <option name="AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="SPLITTER_PROPORTION" value="0.5" />
-    <option name="GROUP_BY_SEVERITY" value="false" />
-    <option name="FILTER_RESOLVED_ITEMS" value="true" />
-    <option name="ANALYZE_TEST_SOURCES" value="true" />
-    <option name="SHOW_DIFF_WITH_PREVIOUS_RUN" value="false" />
-    <option name="SCOPE_TYPE" value="1" />
-    <option name="CUSTOM_SCOPE_NAME" value="" />
-    <option name="SHOW_ONLY_DIFF" value="false" />
-    <option name="myCurrentProfileName" value="Default" />
-  </component>
-  <component name="J2EEProjectPane" />
-  <component name="JspContextManager" />
   <component name="ModuleEditorState">
     <option name="LAST_EDITED_MODULE_NAME" />
     <option name="LAST_EDITED_TAB_NAME" />
   </component>
-  <component name="NamedScopeManager" />
   <component name="PackagesPane">
     <subPane>
       <PATH>
@@ -225,28 +225,6 @@
     <option name="USE_CLIENT_FILTER" value="true" />
     <option name="CLIENT" value="" />
   </component>
-  <component name="PerforceDirect.Settings">
-    <option name="useP4CONFIG" value="true" />
-    <option name="port" value="&lt;perforce_server&gt;:1666" />
-    <option name="client" value="" />
-    <option name="user" value="" />
-    <option name="passwd" value="" />
-    <option name="showCmds" value="false" />
-    <option name="useNativeApi" value="false" />
-    <option name="pathToExec" value="p4" />
-    <option name="useCustomPathToExec" value="false" />
-    <option name="SYNC_FORCE" value="false" />
-    <option name="SYNC_RUN_RESOLVE" value="true" />
-    <option name="REVERT_UNCHANGED_FILES" value="true" />
-    <option name="CHARSET" value="none" />
-    <option name="SHOW_BRANCHES_HISTORY" value="true" />
-    <option name="ENABLED" value="true" />
-    <option name="USE_LOGIN" value="false" />
-    <option name="LOGIN_SILENTLY" value="false" />
-    <option name="INTEGRATE_RUN_RESOLVE" value="true" />
-    <option name="INTEGRATE_REVERT_UNCHANGED" value="true" />
-    <option name="SERVER_TIMEOUT" value="20000" />
-  </component>
   <component name="ProjectLevelVcsManager">
     <OptionsSetting value="true" id="Add" />
     <OptionsSetting value="true" id="Remove" />
@@ -265,53 +243,17 @@
     <subPane>
       <PATH>
         <PATH_ELEMENT>
-          <option name="myItemId" value="MePixel.ipr" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
           <option name="myItemId" value="MePixel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Libraries" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="MePixel.ipr" />
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
           <option name="myItemId" value="MePixel" />
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
         </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
       </PATH>
       <PATH>
         <PATH_ELEMENT>
-          <option name="myItemId" value="MePixel.ipr" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
           <option name="myItemId" value="MePixel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="MePixel.ipr" />
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
@@ -319,66 +261,10 @@
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/META-INF" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="MePixel.ipr" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
           <option name="myItemId" value="MePixel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/com/thinkberg" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/com/thinkberg/mepixel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
       </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="MePixel.ipr" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="MePixel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/com/thinkberg" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
     </subPane>
   </component>
   <component name="ProjectReloadState">
@@ -392,31 +278,34 @@
       <showLibraryContents />
       <hideEmptyPackages />
       <abbreviatePackageNames />
-      <showStructure Scope="false" ProjectPane="false" PackagesPane="false" Favorites="false" />
+      <showStructure PackagesPane="false" Scope="false" Favorites="false" ProjectPane="false" />
       <autoscrollToSource />
       <autoscrollFromSource />
       <sortByType />
     </navigator>
   </component>
   <component name="PropertiesComponent">
+    <property name="project.structure.proportion" value="0.0" />
     <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
+    <property name="project.structure.last.edited" value="Project" />
+    <property name="options.splitter.main.proportions" value="0.3" />
     <property name="MemberChooser.sorted" value="false" />
+    <property name="options.searchVisible" value="true" />
     <property name="RunManagerConfig.compileBeforeRunning" value="true" />
     <property name="GoToFile.includeJavaFiles" value="false" />
+    <property name="GoToClass.includeLibraries" value="false" />
+    <property name="options.splitter.details.proportions" value="0.2" />
+    <property name="MemberChooser.showClasses" value="true" />
+    <property name="project.structure.side.proportion" value="0.2" />
+    <property name="options.lastSelected" value="project.propVCSSupport.Mappings" />
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />
     <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" />
   </component>
-  <component name="ReadonlyStatusHandler">
-    <option name="SHOW_DIALOG" value="true" />
-  </component>
   <component name="RecentsManager">
     <key name="IntroduceConstantDialog.RECENTS_KEY">
       <recent name="" />
     </key>
   </component>
-  <component name="RestoreUpdateTree" />
   <component name="RunManager" selected="Application.MePixelLauncher">
     <configuration default="true" type="Remote" factoryName="Remote">
       <option name="USE_SOCKET_TRANSPORT" value="true" />
@@ -437,7 +326,7 @@
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
     </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
+    <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false" runner="emma">
       <module name="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
@@ -448,15 +337,18 @@
       <option name="VM_PARAMETERS" />
       <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
       <option name="ADDITIONAL_CLASS_PATH" />
       <option name="TEST_SEARCH_SCOPE">
         <value defaultName="wholeProject" />
       </option>
+      <envs />
       <method>
         <option name="Make" value="true" />
       </method>
     </configuration>
-    <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
+    <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false" runner="emma">
       <option name="MAIN_CLASS_NAME" />
       <option name="VM_PARAMETERS" />
       <option name="PROGRAM_PARAMETERS" />
@@ -464,12 +356,15 @@
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
       <module name="" />
+      <envs />
       <method>
         <option name="Make" value="true" />
       </method>
     </configuration>
-    <configuration default="false" name="MePixel" type="Application" factoryName="Application" enabled="false" merge="false">
+    <configuration default="false" name="MePixel" type="Application" factoryName="Application" enabled="false" merge="false" runner="emma">
       <option name="MAIN_CLASS_NAME" value="com.thinkberg.mepixel.MePixel" />
       <option name="VM_PARAMETERS" value="" />
       <option name="PROGRAM_PARAMETERS" value="80" />
@@ -477,7 +372,10 @@
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" value="" />
       <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
       <module name="MePixel" />
+      <envs />
       <RunnerSettings RunnerId="Profile ">
         <option name="myStartupWithAllocations" value="false" />
         <option name="myCPUStartup" value="" />
@@ -496,7 +394,7 @@
         <option name="Make" value="true" />
       </method>
     </configuration>
-    <configuration default="false" name="MePixelLauncher" type="Application" factoryName="Application" enabled="false" merge="false">
+    <configuration default="false" name="MePixelLauncher" type="Application" factoryName="Application" enabled="false" merge="false" runner="emma">
       <option name="MAIN_CLASS_NAME" value="com.thinkberg.mepixel.MePixelLauncher" />
       <option name="VM_PARAMETERS" />
       <option name="PROGRAM_PARAMETERS" />
@@ -504,13 +402,20 @@
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
       <module name="MePixel" />
+      <envs />
       <RunnerSettings RunnerId="Run" />
       <ConfigurationWrapper RunnerId="Run" />
       <method>
         <option name="Make" value="true" />
       </method>
     </configuration>
+    <list size="2">
+      <item index="0" class="java.lang.String" itemvalue="Application.MePixel" />
+      <item index="1" class="java.lang.String" itemvalue="Application.MePixelLauncher" />
+    </list>
   </component>
   <component name="ScopeViewComponent">
     <subPane subId="Project">
@@ -522,7 +427,7 @@
       </PATH>
     </subPane>
   </component>
-  <component name="SelectInManager" />
+  <component name="ShelveChangesManager" show_recycled="false" />
   <component name="StarteamConfiguration">
     <option name="SERVER" value="" />
     <option name="PORT" value="49201" />
@@ -534,7 +439,6 @@
     <option name="LOCK_ON_CHECKOUT" value="false" />
     <option name="UNLOCK_ON_CHECKIN" value="false" />
   </component>
-  <component name="StructuralSearchPlugin" />
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="true" />
     <option name="AUTOSCROLL_FROM_SOURCE" value="false" />
@@ -565,13 +469,14 @@
   <component name="SvnConfiguration">
     <option name="USER" value="" />
     <option name="PASSWORD" value="" />
-    <option name="PROCESS_UNRESOLVED" value="false" />
     <option name="LAST_MERGED_REVISION" />
     <option name="UPDATE_RUN_STATUS" value="false" />
-    <option name="UPDATE_RECURSIVELY" value="true" />
     <option name="MERGE_DRY_RUN" value="false" />
+    <option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
+    <option name="UPDATE_LOCK_ON_DEMAND" value="false" />
     <configuration useDefault="true">/Users/leo/.subversion</configuration>
     <upgradeMode>auto</upgradeMode>
+    <myIsUseDefaultProxy>false</myIsUseDefaultProxy>
   </component>
   <component name="TodoView" selected-index="0">
     <todo-panel id="selected-file">
@@ -586,38 +491,48 @@
       <flatten-packages value="false" />
       <is-autoscroll-to-source value="true" />
     </todo-panel>
+    <todo-panel id="default-changelist">
+      <are-packages-shown value="false" />
+      <are-modules-shown value="false" />
+      <flatten-packages value="false" />
+      <is-autoscroll-to-source value="false" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="22" width="1276" height="778" extended-state="0" />
-    <editor active="false" />
+    <frame x="0" y="22" width="1276" height="778" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
-      <window_info id="Maven-2 Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
-      <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
-      <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24938875" order="0" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32892805" order="1" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32892805" order="8" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" />
-      <window_info id="Profile" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
-      <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
-      <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
-      <window_info id="Ant Build" active="true" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.12224939" order="1" />
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32892805" order="2" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
-      <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="4" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" />
-      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
-      <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="3" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" />
+      <window_info id="Web Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" />
+      <window_info id="Dataflow to this" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" />
+      <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24938875" sideWeight="0.6610687" order="0" side_tool="false" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32892805" sideWeight="0.5" order="1" side_tool="false" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24938875" sideWeight="0.5" order="1" side_tool="false" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="6" side_tool="false" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32824427" sideWeight="0.5" order="8" side_tool="false" />
+      <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.119804405" sideWeight="0.6610687" order="1" side_tool="false" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32824427" sideWeight="0.5" order="2" side_tool="false" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" />
+      <window_info id="Maven-2 Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" />
+      <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" />
+      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" />
+      <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="3" side_tool="false" />
+      <window_info id="Profile" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" />
+      <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="5" side_tool="false" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" />
+      <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" />
     </layout>
   </component>
   <component name="VCS.FileViewConfiguration">
@@ -632,28 +547,28 @@
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
     <option name="PERFORM_UPDATE_IN_BACKGROUND" value="false" />
     <option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" />
-    <option name="PUT_FOCUS_INTO_COMMENT" value="false" />
+    <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
     <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
-    <option name="LAST_COMMIT_MESSAGE" />
-    <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
-    <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
-    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
-    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
+    <option name="LAST_COMMIT_MESSAGE" value="some minor code cleanup and documentation" />
+    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
+    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
     <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
     <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
     <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
-    <option name="ERROR_OCCURED" value="false" />
     <option name="ACTIVE_VCS_NAME" value="svn" />
     <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
+    <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
     <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
     <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
+    <MESSAGE value="some minor code cleanup and documentation" />
   </component>
   <component name="VssConfiguration">
     <option name="CLIENT_PATH" value="" />
     <option name="SRCSAFEINI_PATH" value="" />
     <option name="USER_NAME" value="" />
     <option name="PWD" value="" />
-    <option name="VSS_IS_INITIALIZED" value="true" />
     <CheckoutOptions>
       <option name="COMMENT" value="" />
       <option name="DO_NOT_GET_LATEST_VERSION" value="false" />
@@ -668,7 +583,6 @@
     <AddOptions>
       <option name="STORE_ONLY_LATEST_VERSION" value="false" />
       <option name="CHECK_OUT_IMMEDIATELY" value="false" />
-      <option name="FILE_TYPE" value="0" />
     </AddOptions>
     <UndocheckoutOptions>
       <option name="MAKE_WRITABLE" value="false" />
@@ -683,8 +597,14 @@
       <option name="RECURSIVE" value="false" />
       <option name="VERSION" />
     </GetOptions>
-    <VssConfigurableExcludedFilesTag />
   </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager />
+  </component>
+  <component name="XPathView.XPathProjectComponent">
+    <history />
+    <find-history />
+  </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="FILTER_TARGETS" value="false" />
@@ -722,48 +642,109 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/build.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="65" column="8" selection-start="2409" selection-end="2409" vertical-scroll-proportion="0.7694805">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/META-INF/mepixel.manifest">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="3" column="0" selection-start="126" selection-end="126" vertical-scroll-proportion="0.0570523">
-          <folding />
-        </state>
+        <state line="3" column="0" selection-start="126" selection-end="126" vertical-scroll-proportion="0.0570523" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/thinkberg/mepixel/CameraGrabberThread.java">
+    <entry file="file://$PROJECT_DIR$/build.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="110" column="0" selection-start="3069" selection-end="3069" vertical-scroll-proportion="0.53246754">
+        <state line="37" column="34" selection-start="1264" selection-end="1264" vertical-scroll-proportion="-7.105263">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/com/thinkberg/mepixel/BufferedDisplay.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="18" column="13" selection-start="431" selection-end="431" vertical-scroll-proportion="0.2282092">
+        <state line="16" column="6" selection-start="357" selection-end="357" vertical-scroll-proportion="0.0">
+          <folding>
+            <marker date="1226491490000" expanded="true" signature="502:743" placeholder="{...}" />
+            <marker date="1226491490000" expanded="true" signature="790:961" placeholder="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/thinkberg/mepixel/CameraGrabberThread.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="26" column="6" selection-start="805" selection-end="805" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/com/thinkberg/mepixel/MePixel.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="21" column="3" selection-start="614" selection-end="614" vertical-scroll-proportion="0.17532468">
-          <folding />
+        <state line="121" column="8" selection-start="4725" selection-end="4725" vertical-scroll-proportion="0.0">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/com/thinkberg/mepixel/MePixelLauncher.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="36" column="0" selection-start="1166" selection-end="1166" vertical-scroll-proportion="0.2353896">
+        <state line="31" column="33" selection-start="1012" selection-end="1012" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
   </component>
+  <component name="masterDetails">
+    <option name="states">
+      <map>
+        <entry key="Errors.UI">
+          <value>
+            <UIState>
+              <option name="proportions">
+                <SplitterProportionsDataImpl />
+              </option>
+            </UIState>
+          </value>
+        </entry>
+        <entry key="ScopeChooserConfigurable.UI">
+          <value>
+            <UIState>
+              <option name="proportions">
+                <SplitterProportionsDataImpl>
+                  <option name="proportions">
+                    <list>
+                      <option value="0.2" />
+                    </list>
+                  </option>
+                </SplitterProportionsDataImpl>
+              </option>
+            </UIState>
+          </value>
+        </entry>
+      </map>
+    </option>
+    <option name="myStates">
+      <map>
+        <entry key="Errors.UI">
+          <value>
+            <UIState>
+              <option name="proportions">
+                <SplitterProportionsDataImpl />
+              </option>
+            </UIState>
+          </value>
+        </entry>
+        <entry key="ScopeChooserConfigurable.UI">
+          <value>
+            <UIState>
+              <option name="proportions">
+                <SplitterProportionsDataImpl>
+                  <option name="proportions">
+                    <list>
+                      <option value="0.2" />
+                    </list>
+                  </option>
+                </SplitterProportionsDataImpl>
+              </option>
+            </UIState>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
 </project>
 
blob - deedc8f08cbf751168a30a155647f2a2e3e23680
blob + 162ae7c12df3899b5264d3c27e81f90989327151
--- src/com/thinkberg/mepixel/BufferedDisplay.java
+++ src/com/thinkberg/mepixel/BufferedDisplay.java
@@ -14,35 +14,35 @@ import java.awt.*;
  *
  * @author Matthias L. Jugel
  */
-public class BufferedDisplay extends JFrame {
-  private Image backingStore;
-  private int xOffset;
-  private int yOffset;
+class BufferedDisplay extends JFrame {
+    private Image backingStore;
+    private int xOffset;
+    private int yOffset;
 
-  public BufferedDisplay() {
-    super();
+    public BufferedDisplay() {
+        super();
 
-    setUndecorated(true);
-    setExtendedState(Frame.MAXIMIZED_BOTH);
-    setVisible(true);
-    setBackground(Color.BLACK);
+        setUndecorated(true);
+        setExtendedState(Frame.MAXIMIZED_BOTH);
+        setVisible(true);
+        setBackground(Color.BLACK);
 
-    getGraphicsConfiguration().getDevice().setFullScreenWindow(this);
+        getGraphicsConfiguration().getDevice().setFullScreenWindow(this);
 
-  }
+    }
 
-  public void setBackingStore(Image image) {
-    backingStore = image;
-    xOffset = (getWidth() - backingStore.getWidth(this)) / 2;
-    yOffset = (getHeight() - backingStore.getHeight(this)) / 2;
-  }
+    public void setBackingStore(Image image) {
+        backingStore = image;
+        xOffset = (getWidth() - backingStore.getWidth(this)) / 2;
+        yOffset = (getHeight() - backingStore.getHeight(this)) / 2;
+    }
 
-  /**
-   * Paint the current screen using the backing store image.
-   */
-  public void paint(Graphics g) {
-    if (backingStore != null) {
-      g.drawImage(backingStore, xOffset, yOffset, this);
+    /**
+     * Paint the current screen using the backing store image.
+     */
+    public void paint(Graphics g) {
+        if (backingStore != null) {
+            g.drawImage(backingStore, xOffset, yOffset, this);
+        }
     }
-  }
 }
blob - 0f538f2bde4cdab2d264d69ded00d6ec51ba9a98
blob + 5ecbfce5bc4c49917ceae8b19c4aa07f4633d4a7
--- src/com/thinkberg/mepixel/CameraGrabberThread.java
+++ src/com/thinkberg/mepixel/CameraGrabberThread.java
@@ -24,98 +24,98 @@ import quicktime.util.RawEncodedImage;
  *
  * @author Matthias L. Jugel
  */
-public class CameraGrabberThread extends Thread {
-  private boolean running = false;
+class CameraGrabberThread extends Thread {
+    private boolean running = false;
 
-  private SequenceGrabber grabber;
-  private SGVideoChannel channel;
-  private RawEncodedImage rowEncodedImage;
-  private int[] pixelData;
-  private int width, height;
+    private SequenceGrabber grabber;
+    private SGVideoChannel channel;
+    private RawEncodedImage rowEncodedImage;
+    private int[] pixelData;
+    private int width, height;
 
-  public CameraGrabberThread() {
-    super();
-  }
+    public CameraGrabberThread() {
+        super();
+    }
 
-  public void init() throws QTException {
-    QTSession.open();
+    public void init() throws QTException {
+        QTSession.open();
 
-    grabber = new SequenceGrabber();
-    channel = new SGVideoChannel(grabber);
+        grabber = new SequenceGrabber();
+        channel = new SGVideoChannel(grabber);
 
-    width = channel.getSrcVideoBounds().getWidth();
-    height = channel.getSrcVideoBounds().getHeight();
-    QDRect bounds = new QDRect(width, height);
-    QDGraphics graphics;
-    if (quicktime.util.EndianOrder.isNativeLittleEndian()) {
-      graphics = new QDGraphics(QDConstants.k32BGRAPixelFormat, bounds);
-    } else {
-      graphics = new QDGraphics(QDGraphics.kDefaultPixelFormat, bounds);
-    }
-    grabber.setGWorld(graphics, null);
-    channel.setBounds(bounds);
-    channel.setUsage(StdQTConstants.seqGrabPreview);
-    grabber.prepare(true, false);
+        width = channel.getSrcVideoBounds().getWidth();
+        height = channel.getSrcVideoBounds().getHeight();
+        QDRect bounds = new QDRect(width, height);
+        QDGraphics graphics;
+        if (quicktime.util.EndianOrder.isNativeLittleEndian()) {
+            graphics = new QDGraphics(QDConstants.k32BGRAPixelFormat, bounds);
+        } else {
+            graphics = new QDGraphics(QDGraphics.kDefaultPixelFormat, bounds);
+        }
+        grabber.setGWorld(graphics, null);
+        channel.setBounds(bounds);
+        channel.setUsage(StdQTConstants.seqGrabPreview);
+        grabber.prepare(true, false);
 
-    grabber.setDataOutput(null, StdQTConstants.seqGrabDontMakeMovie);
-    grabber.prepare(true, true);
-    grabber.startRecord();
+        grabber.setDataOutput(null, StdQTConstants.seqGrabDontMakeMovie);
+        grabber.prepare(true, true);
+        grabber.startRecord();
 
-    PixMap pixMap = graphics.getPixMap();
-    rowEncodedImage = pixMap.getPixelData();
-    pixelData = new int[width * height];
+        PixMap pixMap = graphics.getPixMap();
+        rowEncodedImage = pixMap.getPixelData();
+        pixelData = new int[width * height];
 
-    QTRuntimeException.registerHandler(new QTRuntimeHandler() {
-      public void exceptionOccurred(
-              QTRuntimeException e, Object eGenerator,
-              String methodNameIfKnown, boolean unrecoverableFlag) {
-        System.err.println("A Quicktime error has occurred: " + e.getMessage());
-        e.printStackTrace();
-      }
-    });
-  }
+        QTRuntimeException.registerHandler(new QTRuntimeHandler() {
+            public void exceptionOccurred(
+                    QTRuntimeException e, Object eGenerator,
+                    String methodNameIfKnown, boolean unrecoverableFlag) {
+                System.err.println("A Quicktime error has occurred: " + e.getMessage());
+                e.printStackTrace();
+            }
+        });
+    }
 
-  public int getCameraWidth() {
-    return width;
-  }
+    public int getCameraWidth() {
+        return width;
+    }
 
-  public int getCameraHeight() {
-    return height;
-  }
+    public int getCameraHeight() {
+        return height;
+    }
 
-  public void enable() {
-    running = true;
-    start();
-  }
+    public void enable() {
+        running = true;
+        start();
+    }
 
-  public void disable() {
-    running = true;
-  }
+    public void disable() {
+        running = true;
+    }
 
-  public void run() {
-    try {
-      while (running) {
-        grabber.idle();
-        rowEncodedImage.copyToArray(0, pixelData, 0, pixelData.length);
-      }
-    } catch (QTException e) {
-      e.printStackTrace();
+    public void run() {
+        try {
+            while (running) {
+                grabber.idle();
+                rowEncodedImage.copyToArray(0, pixelData, 0, pixelData.length);
+            }
+        } catch (QTException e) {
+            e.printStackTrace();
+        }
     }
-  }
 
-  public int[] getPixelData() {
-    return pixelData;
-  }
+    public int[] getPixelData() {
+        return pixelData;
+    }
 
-  public void dispose() {
-    try {
-      grabber.stop();
-      grabber.release();
-      grabber.disposeChannel(channel);
-    } catch (Exception e) {
-      e.printStackTrace();
-    } finally {
-      QTSession.close();
+    public void dispose() {
+        try {
+            grabber.stop();
+            grabber.release();
+            grabber.disposeChannel(channel);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            QTSession.close();
+        }
     }
-  }
 }
blob - d7a62eb0dbcd64db9e6c636b7eaaa01933bcb285
blob + 855528c8984ca566127f7092e8976953054a62ee
--- src/com/thinkberg/mepixel/MePixel.java
+++ src/com/thinkberg/mepixel/MePixel.java
@@ -22,169 +22,169 @@ import java.io.InputStreamReader;
  *
  * @author Matthias L. Jugel
  */
-public class MePixel {
-  private static int delay = 20;
-  private static boolean fillSwap = true;
-  private static boolean charSwap = false;
-  private static double brightnessThreshold = 0.50;
+class MePixel {
+    private static int delay = 20;
+    private static boolean fillSwap = true;
+    private static boolean charSwap = false;
+    private static double brightnessThreshold = 0.50;
 
 
-  private static void showUsage() {
-    System.out.println("MePixel (c) 2007 Matthias L. Jugel. All Rights Reserved.");
-    System.out.println();
-    System.out.println("** Use cursor 'UP' and 'DOWN' to increase/decrease speed");
-    System.out.println("** Use cursor 'LEFT' and 'RIGHT' to change the brightness threshold");
-    System.out.println("** Press 'C' to change between number and rectangle fill mode");
-    System.out.println("** Press 'F' to toggle fill modes (toggle 1 and 0)");
-    System.out.println("** To quit, press 'Cmd-Q' or 'Alt-F4'");
-    System.out.println();
-    System.out.println("Press return to continue ...");
-    try {
-      new BufferedReader(new InputStreamReader(System.in)).readLine();
-    } catch (IOException e) {
-      // ignore
+    private static void showUsage() {
+        System.out.println("MePixel (c) 2007 Matthias L. Jugel. All Rights Reserved.");
+        System.out.println();
+        System.out.println("** Use cursor 'UP' and 'DOWN' to increase/decrease speed");
+        System.out.println("** Use cursor 'LEFT' and 'RIGHT' to change the brightness threshold");
+        System.out.println("** Press 'C' to change between number and rectangle fill mode");
+        System.out.println("** Press 'F' to toggle fill modes (toggle 1 and 0)");
+        System.out.println("** To quit, press 'Cmd-Q' or 'Alt-F4'");
+        System.out.println();
+        System.out.println("Press return to continue ...");
+        try {
+            new BufferedReader(new InputStreamReader(System.in)).readLine();
+        } catch (IOException e) {
+            // ignore
+        }
     }
-  }
 
-  public MePixel(String[] args) {
-    showUsage();
+    public MePixel(String[] args) {
+        showUsage();
 
-    int fontSize = 8;
-    try {
-      if (args.length > 0) {
-        fontSize = Integer.parseInt(args[0]);
-      }
-    } catch (NumberFormatException e) {
-      // ignore if the value is not an integer
-    }
+        int fontSize = 8;
+        try {
+            if (args.length > 0) {
+                fontSize = Integer.parseInt(args[0]);
+            }
+        } catch (NumberFormatException e) {
+            // ignore if the value is not an integer
+        }
 
-    CameraGrabberThread cameraGrabber = new CameraGrabberThread();
-    try {
-      cameraGrabber.init();
-    } catch (QTException e) {
-      System.err.println("Camera grabber failed: " + e.getMessage() + " (no camera found?)");
-      System.err.println("Exiting ...");
-      System.exit(-1);
-    }
-    cameraGrabber.enable();
+        CameraGrabberThread cameraGrabber = new CameraGrabberThread();
+        try {
+            cameraGrabber.init();
+        } catch (QTException e) {
+            System.err.println("Camera grabber failed: " + e.getMessage() + " (no camera found?)");
+            System.err.println("Exiting ...");
+            System.exit(-1);
+        }
+        cameraGrabber.enable();
 
-    int cameraWidth = cameraGrabber.getCameraWidth();
-    int cameraHeight = cameraGrabber.getCameraHeight();
+        int cameraWidth = cameraGrabber.getCameraWidth();
+        int cameraHeight = cameraGrabber.getCameraHeight();
 
-    int[] pixelData = cameraGrabber.getPixelData();
+        int[] pixelData = cameraGrabber.getPixelData();
 
-    BufferedDisplay bufferedDisplay = new BufferedDisplay();
-    bufferedDisplay.addKeyListener(new KeyAdapter() {
-      public void keyPressed(KeyEvent keyEvent) {
-        switch (keyEvent.getKeyCode()) {
-          case KeyEvent.VK_UP:
-            delay += 20;
-            break;
-          case KeyEvent.VK_DOWN:
-            if (delay >= 20) delay -= 20;
-            break;
-          case KeyEvent.VK_LEFT:
-            if (brightnessThreshold > 0) brightnessThreshold -= 0.05;
-            break;
-          case KeyEvent.VK_RIGHT:
-            if (brightnessThreshold < 1) brightnessThreshold += 0.05;
-            break;
-          case KeyEvent.VK_F:
-            fillSwap = !fillSwap;
-            break;
-          case KeyEvent.VK_C:
-            charSwap = !charSwap;
-        }
-      }
-    });
+        BufferedDisplay bufferedDisplay = new BufferedDisplay();
+        bufferedDisplay.addKeyListener(new KeyAdapter() {
+            public void keyPressed(KeyEvent keyEvent) {
+                switch (keyEvent.getKeyCode()) {
+                    case KeyEvent.VK_UP:
+                        delay += 20;
+                        break;
+                    case KeyEvent.VK_DOWN:
+                        if (delay >= 20) delay -= 20;
+                        break;
+                    case KeyEvent.VK_LEFT:
+                        if (brightnessThreshold > 0) brightnessThreshold -= 0.05;
+                        break;
+                    case KeyEvent.VK_RIGHT:
+                        if (brightnessThreshold < 1) brightnessThreshold += 0.05;
+                        break;
+                    case KeyEvent.VK_F:
+                        fillSwap = !fillSwap;
+                        break;
+                    case KeyEvent.VK_C:
+                        charSwap = !charSwap;
+                }
+            }
+        });
 
-    Font font = new Font("Bitstream Vera Sans Mono", Font.PLAIN, fontSize);
-    bufferedDisplay.setFont(font);
-    int charWidth = bufferedDisplay.getFontMetrics(font).charWidth('@');
-    int charHeight = bufferedDisplay.getFontMetrics(font).getHeight();
-    int adaptedScreenHeight = bufferedDisplay.getHeight() / charHeight;
-    int adaptedScreenWidth = bufferedDisplay.getWidth() / charWidth;
-    System.out.println("Using a character size of [" + charWidth + "x" + charHeight + "] pixels");
-    System.out.println("The screen is divided into [" + adaptedScreenWidth + "x" + adaptedScreenHeight + "] squares");
+        Font font = new Font("Bitstream Vera Sans Mono", Font.PLAIN, fontSize);
+        bufferedDisplay.setFont(font);
+        int charWidth = bufferedDisplay.getFontMetrics(font).charWidth('@');
+        int charHeight = bufferedDisplay.getFontMetrics(font).getHeight();
+        int adaptedScreenHeight = bufferedDisplay.getHeight() / charHeight;
+        int adaptedScreenWidth = bufferedDisplay.getWidth() / charWidth;
+        System.out.println("Using a character size of [" + charWidth + "x" + charHeight + "] pixels");
+        System.out.println("The screen is divided into [" + adaptedScreenWidth + "x" + adaptedScreenHeight + "] squares");
 
 
-    BufferedImage cachedImage = new BufferedImage(adaptedScreenWidth * charWidth,
-                                                  adaptedScreenHeight * charHeight,
-                                                  BufferedImage.TYPE_INT_RGB);
-    Graphics2D cachedImageG2D = cachedImage.createGraphics();
-    cachedImageG2D.setFont(font);
-    bufferedDisplay.setBackingStore(cachedImage);
-    float[] hsvValues = new float[3];
+        BufferedImage cachedImage = new BufferedImage(adaptedScreenWidth * charWidth,
+                adaptedScreenHeight * charHeight,
+                BufferedImage.TYPE_INT_RGB);
+        Graphics2D cachedImageG2D = cachedImage.createGraphics();
+        cachedImageG2D.setFont(font);
+        bufferedDisplay.setBackingStore(cachedImage);
+        float[] hsvValues = new float[3];
 
-    int rectWidth = cameraWidth / adaptedScreenWidth;
-    int rectHeight = cameraHeight / adaptedScreenHeight;
+        int rectWidth = cameraWidth / adaptedScreenWidth;
+        int rectHeight = cameraHeight / adaptedScreenHeight;
 
-    while (true) {
-      for (int row = 0; row < cameraHeight; row += rectHeight) {
-        int y = (row / rectHeight) * charHeight;
+        while (true) {
+            for (int row = 0; row < cameraHeight; row += rectHeight) {
+                int y = (row / rectHeight) * charHeight;
 
-        cachedImageG2D.setColor(bufferedDisplay.getBackground());
-        cachedImageG2D.fillRect(0, y, cameraWidth * charWidth, charHeight);
+                cachedImageG2D.setColor(bufferedDisplay.getBackground());
+                cachedImageG2D.fillRect(0, y, cameraWidth * charWidth, charHeight);
 
-        for (int column = 0; column < cameraWidth; column += rectWidth) {
-          int offset = (row * cameraWidth) + column;
-          int avgColor = getAveragedRectPixelColor(pixelData, offset, cameraWidth, rectWidth, rectHeight);
+                for (int column = 0; column < cameraWidth; column += rectWidth) {
+                    int offset = (row * cameraWidth) + column;
+                    int avgColor = getAveragedRectPixelColor(pixelData, offset, cameraWidth, rectWidth, rectHeight);
 
-          int x = ((cameraWidth - column) / rectWidth) * charWidth;
+                    int x = ((cameraWidth - column) / rectWidth) * charWidth;
 
 
-          Color fg = new Color(avgColor);
-          Color.RGBtoHSB(fg.getRed(), fg.getGreen(), fg.getBlue(), hsvValues);
-          cachedImageG2D.setColor(fg);
-          if ((fillSwap && (hsvValues[2] > brightnessThreshold)) ||
-                  (!fillSwap && hsvValues[2] < brightnessThreshold)) {
-            if (charSwap) {
-              cachedImageG2D.drawRect(x, y, charWidth, charHeight);
-            } else {
-              cachedImageG2D.drawString("1", x, y - charHeight);
+                    Color fg = new Color(avgColor);
+                    Color.RGBtoHSB(fg.getRed(), fg.getGreen(), fg.getBlue(), hsvValues);
+                    cachedImageG2D.setColor(fg);
+                    if ((fillSwap && (hsvValues[2] > brightnessThreshold)) ||
+                            (!fillSwap && hsvValues[2] < brightnessThreshold)) {
+                        if (charSwap) {
+                            cachedImageG2D.drawRect(x, y, charWidth, charHeight);
+                        } else {
+                            cachedImageG2D.drawString("1", x, y - charHeight);
+                        }
+                    } else {
+                        if (charSwap) {
+                            cachedImageG2D.fillRect(x, y, charWidth, charHeight);
+                        } else {
+                            cachedImageG2D.drawString("0", x, y - charHeight);
+                        }
+                    }
+                }
+                bufferedDisplay.repaint();
+                try {
+                    Thread.sleep(delay);
+                } catch (InterruptedException e) {
+                    // ignore thread errors
+                }
             }
-          } else {
-            if (charSwap) {
-              cachedImageG2D.fillRect(x, y, charWidth, charHeight);
-            } else {
-              cachedImageG2D.drawString("0", x, y - charHeight);
-            }
-          }
         }
-        bufferedDisplay.repaint();
-        try {
-          Thread.sleep(delay);
-        } catch (InterruptedException e) {
-          // ignore thread errors
-        }
-      }
     }
-  }
 
-  /**
-   * Calculate the average color for a certain pixel rectangle
-   *
-   * @param image   the image to get the data from
-   * @param offset  current offset (left, top) in the data array
-   * @param rowSize the current row length in bytes
-   * @param width   the width of the rectangle in pixels
-   * @param height  the height of the rectange in pixels
-   * @return a 24 bit color int
-   */
-  private int getAveragedRectPixelColor(int[] image, int offset, int rowSize, int width, int height) {
-    int avgColor = 0;
-    for (int y = 0; y < height; y++) {
-      for (int x = 0; x < width; x++) {
-        int pixColor;
-        try {
-          pixColor = image[offset + (y * rowSize) + x];
-        } catch (Exception e) {
-          return avgColor;
+    /**
+     * Calculate the average color for a certain pixel rectangle
+     *
+     * @param image   the image to get the data from
+     * @param offset  current offset (left, top) in the data array
+     * @param rowSize the current row length in bytes
+     * @param width   the width of the rectangle in pixels
+     * @param height  the height of the rectange in pixels
+     * @return a 24 bit color int
+     */
+    private int getAveragedRectPixelColor(int[] image, int offset, int rowSize, int width, int height) {
+        int avgColor = 0;
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                int pixColor;
+                try {
+                    pixColor = image[offset + (y * rowSize) + x];
+                } catch (Exception e) {
+                    return avgColor;
+                }
+                // color averaging
+                avgColor = (((avgColor ^ pixColor) & 0xfffefefe) >> 1) + (avgColor & pixColor);
+            }
         }
-        // color averaging
-        avgColor = (((avgColor ^ pixColor) & 0xfffefefe) >> 1) + (avgColor & pixColor);
-      }
+        return avgColor;
     }
-    return avgColor;
-  }
 }
blob - 502c12a8854edfb641a1b016dcd3d57943d25ad2
blob + e7d4feddd8701ddaa234ba15f3cb4947c31ba8b1
--- src/com/thinkberg/mepixel/MePixelLauncher.java
+++ src/com/thinkberg/mepixel/MePixelLauncher.java
@@ -23,54 +23,54 @@ import java.util.List;
  * @author Matthias L. Jugel
  */
 public class MePixelLauncher {
-  private static List<String> qtClassPath = Arrays.asList(
-          "/System/Library/Java/Extensions/QTJava.zip",
-          "C:\\Program Files\\Quicktime\\QTSystem\\QTJava.zip",
-          "C:\\Programme\\Quicktime\\QTSystem\\QTJava.zip"
-  );
+    private static final List<String> qtClassPath = Arrays.asList(
+            "/System/Library/Java/Extensions/QTJava.zip",
+            "C:\\Program Files\\Quicktime\\QTSystem\\QTJava.zip",
+            "C:\\Programme\\Quicktime\\QTSystem\\QTJava.zip"
+    );
 
-  public static void main(String args[]) {
+    public static void main(String args[]) {
 
-    System.err.println("MePixelLauncher (c) 2007 Matthias L. Jugel. All Rights Reserved.");
-    System.err.println("++ Checking Quicktime installation ...");
+        System.err.println("MePixelLauncher (c) 2007 Matthias L. Jugel. All Rights Reserved.");
+        System.err.println("++ Checking Quicktime installation ...");
 
-    List<URL> classPath = new ArrayList<URL>();
-    classPath.add(MePixel.class.getProtectionDomain().getCodeSource().getLocation());
-    for (String fileName : qtClassPath) {
-      File file = new File(fileName);
-      if (file.exists()) {
-        try {
-          classPath.add(file.toURL());
-          System.err.println("++ Added " + file + " to class path.");
-        } catch (MalformedURLException e) {
-          // ignore
+        List<URL> classPath = new ArrayList<URL>();
+        classPath.add(MePixel.class.getProtectionDomain().getCodeSource().getLocation());
+        for (String fileName : qtClassPath) {
+            File file = new File(fileName);
+            if (file.exists()) {
+                try {
+                    classPath.add(file.toURL());
+                    System.err.println("++ Added " + file + " to class path.");
+                } catch (MalformedURLException e) {
+                    // ignore
+                }
+            }
         }
-      }
-    }
-    URLClassLoader classLoader = new URLClassLoader(classPath.toArray(new URL[0]), ClassLoader.getSystemClassLoader());
-    Thread.currentThread().setContextClassLoader(classLoader);
+        URLClassLoader classLoader = new URLClassLoader(classPath.toArray(new URL[classPath.size()]), ClassLoader.getSystemClassLoader());
+        Thread.currentThread().setContextClassLoader(classLoader);
 
-    // for the sake of Java Web Start it is necessary to uninstall the security manager
-    if (System.getSecurityManager() != null) {
-      System.err.println("Launcher: uninstalling security manager ...");
-      System.setSecurityManager(null);
-    }
+        // for the sake of Java Web Start it is necessary to uninstall the security manager
+        if (System.getSecurityManager() != null) {
+            System.err.println("Launcher: uninstalling security manager ...");
+            System.setSecurityManager(null);
+        }
 
-    try {
-      Policy.getPolicy().refresh();
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
+        try {
+            Policy.getPolicy().refresh();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
-    System.err.println();
-    try {
-      // load and start main class
-      Class mainClass = classLoader.loadClass("com.thinkberg.mepixel.MePixel");
-      final Constructor mainContructor = mainClass.getConstructor(String[].class);
-      mainContructor.newInstance(new Object[]{args});
-    } catch (Exception e) {
-      e.printStackTrace();
+        System.err.println();
+        try {
+            // load and start main class
+            Class mainClass = classLoader.loadClass("com.thinkberg.mepixel.MePixel");
+            final Constructor mainContructor = mainClass.getConstructor(String[].class);
+            mainContructor.newInstance(new Object[]{args});
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
-  }
 
 }