Commits

oldcyber  committed c1f778e

optimize code and configuration

  • Participants
  • Parent commits e2c6f09

Comments (0)

Files changed (7)

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/1.6"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/1.6"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/Android 1.5 Platform"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

File .idea/inspectionProfiles/Project_Default.xml

+<component name="InspectionProjectProfileManager">
+  <profile version="1.0" is_locked="false">
+    <option name="myName" value="Project Default" />
+    <option name="myLocal" value="false" />
+    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
+      <option name="processCode" value="true" />
+      <option name="processLiterals" value="true" />
+      <option name="processComments" value="false" />
+    </inspection_tool>
+  </profile>
+</component>

File .idea/inspectionProfiles/profiles_settings.xml

+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="PROJECT_PROFILE" value="Project Default" />
+    <option name="USE_PROJECT_PROFILE" value="true" />
+    <version value="1.0" />
+  </settings>
+</component>

File .idea/workspace.xml

     <option name="historyRevisionsNumber" value="4" />
   </component>
   <component name="ChangeListManager" verified="true">
-    <list default="true" readonly="true" id="7a7263cf-a7d3-4210-a78b-d5809243091a" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/ant.xml" />
+    <list default="true" readonly="true" id="7a7263cf-a7d3-4210-a78b-d5809243091a" name="Default" comment="optimize code and configuration">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/TrainingDialog.java" afterPath="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/TrainingDialog.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/mWindowAbout.java" afterPath="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/mWindowAbout.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/MakePlan.java" afterPath="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/MakePlan.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/CopyOfGoTraining.java" afterPath="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/CopyOfGoTraining.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/HundredPushUps.java" afterPath="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/HundredPushUps.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/profiles_settings.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.classpath" afterPath="$PROJECT_DIR$/.classpath" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/GoTraining.java" afterPath="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/GoTraining.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/WriteResult.java" afterPath="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/WriteResult.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/100PushUps.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/RestTime.java" afterPath="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/RestTime.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/TrainingWindow.java" afterPath="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/TrainingWindow.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="hundredpushups-android.iws" />
     <ignored path=".idea/workspace.xml" />
   </component>
   <component name="FileColors" enabled="true" enabledForTabs="true" />
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="HundredPushUps.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/HundredPushUps.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="16" column="0" selection-start="453" selection-end="453" vertical-scroll-proportion="0.18444847">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf />
   </component>
   <component name="FindManager">
     <FindUsagesManager>
         <option value="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/CopyOfGoTraining.java" />
         <option value="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/RestTime.java" />
         <option value="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/MakePlan.java" />
-        <option value="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/TrainingDialog.java" />
         <option value="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/TrainingWindow.java" />
         <option value="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/HundredPushUps.java" />
+        <option value="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/TrainingDialog.java" />
+        <option value="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/GoTraining.java" />
+        <option value="$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/WriteResult.java" />
       </list>
     </option>
   </component>
   </component>
   <component name="ProjectInspectionProfilesVisibleTreeState">
     <entry key="Project Default">
-      <profile-state />
+      <profile-state>
+        <expanded-state>
+          <State>
+            <id>Inspections</id>
+          </State>
+          <State>
+            <id>Spelling</id>
+          </State>
+        </expanded-state>
+        <selected-state>
+          <State>
+            <id>Spelling</id>
+          </State>
+        </selected-state>
+      </profile-state>
     </entry>
   </component>
   <component name="ProjectLevelVcsManager">
       <sortByType />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="hundredpushups-android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="hundredpushups-android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="HundredPushUps" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="tools" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
+      <pane id="Favorites" />
       <pane id="PackagesPane" />
-      <pane id="Favorites" />
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
+    <property name="project.structure.last.edited" value="Modules" />
     <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="project.structure.last.edited" value="Modules" />
+    <property name="project.structure.proportion" value="0.15" />
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="project.structure.proportion" value="0.15" />
     <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="MemberChooser.sorted" value="false" />
     <property name="recentsLimit" value="5" />
-    <property name="MemberChooser.sorted" value="false" />
     <property name="MemberChooser.showClasses" value="true" />
+    <property name="project.structure.side.proportion" value="0.2" />
     <property name="GoToClass.includeLibraries" value="false" />
-    <property name="project.structure.side.proportion" value="0.2" />
+    <property name="GoToClass.includeJavaFiles" value="false" />
     <property name="MemberChooser.copyJavadoc" value="false" />
   </component>
   <component name="RunManager" selected="Android Application.100">
+    <configuration default="true" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" break_at_first_line="false" browser="DEFAULT" class_file="" class="" config_file="" directory="" file="" is_config_by_xml="false" is_groups_set="false" method_class="" method_file="" method="" open_page_automatically="false" scope="Class" stop_session_after_first_page="true" web_path="">
+      <option name="excludedGroups">
+        <set />
+      </option>
+      <option name="includedGroups">
+        <set />
+      </option>
+      <option name="mappings">
+        <list />
+      </option>
+      <option name="sessionId" value="" />
+      <method>
+        <option name="AntTarget" enabled="false" />
+        <option name="BuildArtifacts" enabled="false" />
+        <option name="FtpUpload" enabled="false" />
+        <option name="Maven.BeforeRunTask" enabled="false" />
+      </method>
+    </configuration>
     <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
       <module name="" />
       <option name="TESTING_TYPE" value="0" />
         <option name="Maven.BeforeRunTask" enabled="false" />
       </method>
     </configuration>
-    <configuration default="true" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" break_at_first_line="false" browser="DEFAULT" class_file="" class="" config_file="" directory="" file="" is_config_by_xml="false" is_groups_set="false" method_class="" method_file="" method="" open_page_automatically="false" scope="Class" stop_session_after_first_page="true" web_path="">
-      <option name="excludedGroups">
-        <set />
-      </option>
-      <option name="includedGroups">
-        <set />
-      </option>
-      <option name="mappings">
-        <list />
-      </option>
-      <option name="sessionId" value="" />
-      <method>
-        <option name="AntTarget" enabled="false" />
-        <option name="BuildArtifacts" enabled="false" />
-        <option name="FtpUpload" enabled="false" />
-        <option name="Maven.BeforeRunTask" enabled="false" />
-      </method>
-    </configuration>
     <configuration default="true" type="Remote" factoryName="Remote">
       <option name="USE_SOCKET_TRANSPORT" value="true" />
       <option name="SERVER_MODE" value="false" />
     </todo-panel>
     <todo-panel id="all">
       <are-packages-shown value="true" />
-      <are-modules-shown value="false" />
+      <are-modules-shown value="true" />
       <flatten-packages value="false" />
       <is-autoscroll-to-source value="true" />
     </todo-panel>
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-4" y="-4" width="1288" height="1002" extended-state="0" />
-    <editor active="false" />
+    <frame x="0" y="0" width="1280" height="994" extended-state="0" />
+    <editor active="true" />
     <layout>
-      <window_info id="Changes" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32951945" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33256352" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <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" content_ui="tabs" />
-      <window_info id="Find" 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" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3290993" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <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="3" side_tool="false" content_ui="tabs" />
       <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="7" side_tool="false" content_ui="tabs" />
       <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" content_ui="tabs" />
       <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="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" 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" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32942554" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3290993" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3290993" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
       <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="3" side_tool="false" content_ui="tabs" />
       <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" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24979724" sideWeight="0.6624714" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25142857" sideWeight="0.66281754" order="0" side_tool="false" content_ui="tabs" />
       <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="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38787186" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38683602" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32951945" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Android Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Android Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <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="4" side_tool="false" content_ui="tabs" />
       <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" content_ui="tabs" />
       <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" content_ui="combo" />
     </layout>
   </component>
+  <component name="UpdateCopyrightCheckinHandler">
+    <option name="UPDATE_COPYRIGHT" value="true" />
+  </component>
   <component name="VcsManagerConfiguration">
     <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
     <option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" />
     <option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="true" />
     <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
-    <option name="LAST_COMMIT_MESSAGE" />
+    <option name="LAST_COMMIT_MESSAGE" value="optimize code and configuration" />
     <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
-    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
+    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
     <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
-    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
+    <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="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="optimize code and configuration" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="1" column="1" selection-start="40" selection-end="40" vertical-scroll-proportion="0.0">
+        <state line="1" column="1" selection-start="40" selection-end="40" vertical-scroll-proportion="0.0" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/res/xml/preferences.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="1" column="1" selection-start="40" selection-end="40" vertical-scroll-proportion="0.0" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.idea/copyright/profiles_settings.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="4" column="2" selection-start="101" selection-end="101" vertical-scroll-proportion="0.0" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/res/xml/tests.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="7" selection-start="7" selection-end="7" vertical-scroll-proportion="0.0" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/RestTime.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="15" column="11" selection-start="213" selection-end="213" vertical-scroll-proportion="0.0" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/gen/ru/d_lab/HundredPushUps/R.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="85" column="30" selection-start="4151" selection-end="4151" vertical-scroll-proportion="0.0" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/MakePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="10" column="22" selection-start="267" selection-end="267" vertical-scroll-proportion="0.0" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/Configuration.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="11" column="13" selection-start="306" selection-end="306" vertical-scroll-proportion="0.0" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/res/layout/main.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/res/xml/preferences.xml">
+    <entry file="file://$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/HundredPushUps.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="1" column="1" selection-start="40" selection-end="40" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.idea/copyright/profiles_settings.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="4" column="2" selection-start="101" selection-end="101" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/res/xml/tests.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="7" selection-start="7" selection-end="7" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/CopyOfGoTraining.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="15" column="6" selection-start="437" selection-end="437" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/RestTime.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="15" column="11" selection-start="213" selection-end="213" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gen/ru/d_lab/HundredPushUps/R.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="85" column="30" selection-start="4151" selection-end="4151" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/MakePlan.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="10" column="22" selection-start="267" selection-end="267" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/TrainingDialog.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="157" column="4" selection-start="3923" selection-end="3923" vertical-scroll-proportion="0.0">
+        <state line="23" column="8" selection-start="718" selection-end="718" vertical-scroll-proportion="0.7155963">
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/Configuration.java">
+    <entry file="file://$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/CopyOfGoTraining.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="11" column="13" selection-start="306" selection-end="306" vertical-scroll-proportion="0.0">
+        <state line="15" column="6" selection-start="437" selection-end="437" vertical-scroll-proportion="0.12477064">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/mWindowAbout.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="17" column="16" selection-start="661" selection-end="661" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/TrainingWindow.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="77" column="19" selection-start="1725" selection-end="1725" vertical-scroll-proportion="0.53467155">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/WriteResult.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="18" column="31" selection-start="335" selection-end="335" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/TrainingWindow.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="23" column="17" selection-start="496" selection-end="496" vertical-scroll-proportion="0.71115535">
+        <state line="56" column="18" selection-start="1362" selection-end="1362" vertical-scroll-proportion="0.6277372">
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/HundredPushUps.java">
+    <entry file="file://$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/tools/TrainingDialog.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="16" column="0" selection-start="453" selection-end="453" vertical-scroll-proportion="0.18444847">
+        <state line="35" column="74" selection-start="871" selection-end="871" vertical-scroll-proportion="0.560219">
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/ru/d_lab/HundredPushUps/GoTraining.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="153" column="17" selection-start="6987" selection-end="6987" vertical-scroll-proportion="0.3959854">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

File src/ru/d_lab/HundredPushUps/GoTraining.java

 package ru.d_lab.HundredPushUps;
 
-import ru.d_lab.HundredPushUps.tools.MakePlan;
-import ru.d_lab.HundredPushUps.tools.TrainingDialog;
-import ru.d_lab.HundredPushUps.tools.WriteResult;
 import android.app.Activity;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.widget.Button;
 import android.widget.TableRow;
 import android.widget.TextView;
+import ru.d_lab.HundredPushUps.tools.MakePlan;
+import ru.d_lab.HundredPushUps.tools.TrainingDialog;
 
 public class GoTraining extends Activity implements OnClickListener {
-	/** Called when the activity is first created. */
-	private static final int TRAINING = 1;
-	private static final int SAVING = 2;
+    /**
+     * Called when the activity is first created.
+     */
+/*	private static final int TRAINING = 1;
+	private static final int SAVING = 2;*/
 
 // Welcome training screen
-	@Override
-	public void onCreate(Bundle savedInstanceState)
-{
-super.onCreate(savedInstanceState);
-setContentView(R.layout.training);
-setTitle(R.string.mtitle_Training);
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.training);
+        setTitle(R.string.mtitle_Training);
 //Load application preferences
 
-SharedPreferences settings = getSharedPreferences("FileSettings", 0);
-int trainingWeek = settings.getInt("TrainingWeek", 1);
-int trainingDay = settings.getInt("TrainingDay", 1);
-int trainingLevel = settings.getInt("TrainingLevel", 0);
+        SharedPreferences settings = getSharedPreferences("FileSettings", 0);
+        int trainingWeek = settings.getInt("TrainingWeek", 1);
+        int trainingDay = settings.getInt("TrainingDay", 1);
+        int trainingLevel = settings.getInt("TrainingLevel", 0);
 
-if (trainingWeek < 5){
-	TextView tv1 = (TextView) findViewById(R.id.Trainig1);
-	TextView tv2 = (TextView) findViewById(R.id.Trainig2);
-	TextView tv3 = (TextView) findViewById(R.id.Trainig3);
-	TextView tv4 = (TextView) findViewById(R.id.Trainig4);
-	TextView tv5 = (TextView) findViewById(R.id.Trainig5);
+        if (trainingWeek < 5) {
+            TextView tv1 = (TextView) findViewById(R.id.Trainig1);
+            TextView tv2 = (TextView) findViewById(R.id.Trainig2);
+            TextView tv3 = (TextView) findViewById(R.id.Trainig3);
+            TextView tv4 = (TextView) findViewById(R.id.Trainig4);
+            TextView tv5 = (TextView) findViewById(R.id.Trainig5);
 
-	MakePlan WeekPlan = new MakePlan(trainingLevel, trainingDay, trainingWeek);
-	String[] cPlan = WeekPlan.gettTrainingPlan(this);
-	
-	tv1.setText(cPlan[0]);
-	tv2.setText(cPlan[1]);
-	tv3.setText(cPlan[2]);
-	tv4.setText(cPlan[3]);
-	tv5.setText("max ("+getText(R.string.TrainingMax)+" "+cPlan[4]+")");
-}
-else if (trainingWeek ==5 ){
-	if (trainingDay == 1){
-		TextView tv1 = (TextView) findViewById(R.id.Trainig1);
-		TextView tv2 = (TextView) findViewById(R.id.Trainig2);
-		TextView tv3 = (TextView) findViewById(R.id.Trainig3);
-		TextView tv4 = (TextView) findViewById(R.id.Trainig4);
-		TextView tv5 = (TextView) findViewById(R.id.Trainig5);
+            MakePlan WeekPlan = new MakePlan(trainingLevel, trainingDay, trainingWeek);
+            String[] cPlan = WeekPlan.gettTrainingPlan(this);
 
-		MakePlan WeekPlan = new MakePlan(trainingLevel, trainingDay, trainingWeek);
-		String[] cPlan = WeekPlan.gettTrainingPlan(this);
+            tv1.setText(cPlan[0]);
+            tv2.setText(cPlan[1]);
+            tv3.setText(cPlan[2]);
+            tv4.setText(cPlan[3]);
+            tv5.setText("max (" + getText(R.string.TrainingMax) + " " + cPlan[4] + ")");
+        } else if (trainingWeek == 5) {
+            if (trainingDay == 1) {
+                TextView tv1 = (TextView) findViewById(R.id.Trainig1);
+                TextView tv2 = (TextView) findViewById(R.id.Trainig2);
+                TextView tv3 = (TextView) findViewById(R.id.Trainig3);
+                TextView tv4 = (TextView) findViewById(R.id.Trainig4);
+                TextView tv5 = (TextView) findViewById(R.id.Trainig5);
 
-		tv1.setText(cPlan[0]);
-		tv2.setText(cPlan[1]);
-		tv3.setText(cPlan[2]);
-		tv4.setText(cPlan[3]);
-		tv5.setText("max ("+getText(R.string.TrainingMax)+" "+cPlan[4]+")");	
-	}
-	else {
-	TextView tv1 = (TextView) findViewById(R.id.Trainig1);
-	TextView tv2 = (TextView) findViewById(R.id.Trainig2);
-	TextView tv3 = (TextView) findViewById(R.id.Trainig3);
-	TextView tv4 = (TextView) findViewById(R.id.Trainig4);
-	TextView tv5 = (TextView) findViewById(R.id.Trainig5);
-	TextView tv6 = (TextView) findViewById(R.id.Trainig6);
-	TextView tv7 = (TextView) findViewById(R.id.Trainig7);
-	
-	MakePlan WeekPlan = new MakePlan(trainingLevel, trainingDay, trainingWeek);
-	String[] cPlan = WeekPlan.gettTrainingPlan(this);
-		
-	TableRow rec6 = (TableRow)findViewById(R.id.TTrainig6);
-	rec6.setVisibility(View.VISIBLE);
-	TableRow rec7 = (TableRow)findViewById(R.id.TTrainig6);
-	rec7.setVisibility(View.VISIBLE);
-		
-	tv1.setText(cPlan[0]);
-	tv2.setText(cPlan[1]);
-	tv3.setText(cPlan[2]);
-	tv4.setText(cPlan[3]);
-	tv5.setText(cPlan[4]);
-	tv6.setText(cPlan[5]);
-	tv7.setText("max ("+getText(R.string.TrainingMax)+" "+cPlan[6]+")");
-	}
-}
-	
-else if (trainingWeek == 6){
-	if (trainingDay == 1){
-	TextView tv1 = (TextView) findViewById(R.id.Trainig1);
-	TextView tv2 = (TextView) findViewById(R.id.Trainig2);
-	TextView tv3 = (TextView) findViewById(R.id.Trainig3);
-	TextView tv4 = (TextView) findViewById(R.id.Trainig4);
-	TextView tv5 = (TextView) findViewById(R.id.Trainig5);
+                MakePlan WeekPlan = new MakePlan(trainingLevel, trainingDay, trainingWeek);
+                String[] cPlan = WeekPlan.gettTrainingPlan(this);
 
-	MakePlan WeekPlan = new MakePlan(trainingLevel, trainingDay, trainingWeek);
-	String[] cPlan = WeekPlan.gettTrainingPlan(this);
+                tv1.setText(cPlan[0]);
+                tv2.setText(cPlan[1]);
+                tv3.setText(cPlan[2]);
+                tv4.setText(cPlan[3]);
+                tv5.setText("max (" + getText(R.string.TrainingMax) + " " + cPlan[4] + ")");
+            } else {
+                TextView tv1 = (TextView) findViewById(R.id.Trainig1);
+                TextView tv2 = (TextView) findViewById(R.id.Trainig2);
+                TextView tv3 = (TextView) findViewById(R.id.Trainig3);
+                TextView tv4 = (TextView) findViewById(R.id.Trainig4);
+                TextView tv5 = (TextView) findViewById(R.id.Trainig5);
+                TextView tv6 = (TextView) findViewById(R.id.Trainig6);
+                TextView tv7 = (TextView) findViewById(R.id.Trainig7);
 
-	tv1.setText(cPlan[0]);
-	tv2.setText(cPlan[1]);
-	tv3.setText(cPlan[2]);
-	tv4.setText(cPlan[3]);
-	tv5.setText("max ("+getText(R.string.TrainingMax)+" "+cPlan[4]+")");
-	}
-	else {
-		TextView tv1 = (TextView) findViewById(R.id.Trainig1);
-		TextView tv2 = (TextView) findViewById(R.id.Trainig2);
-		TextView tv3 = (TextView) findViewById(R.id.Trainig3);
-		TextView tv4 = (TextView) findViewById(R.id.Trainig4);
-		TextView tv5 = (TextView) findViewById(R.id.Trainig5);
-		TextView tv6 = (TextView) findViewById(R.id.Trainig6);
-		TextView tv7 = (TextView) findViewById(R.id.Trainig7);
-		TextView tv8 = (TextView) findViewById(R.id.Trainig8);
-		TextView tv9 = (TextView) findViewById(R.id.Trainig9);
-		
-		MakePlan WeekPlan = new MakePlan(trainingLevel, trainingDay, trainingWeek);
-		String[] cPlan = WeekPlan.gettTrainingPlan(this);
+                MakePlan WeekPlan = new MakePlan(trainingLevel, trainingDay, trainingWeek);
+                String[] cPlan = WeekPlan.gettTrainingPlan(this);
 
-		TableRow rec6 = (TableRow)findViewById(R.id.TTrainig6);
-		rec6.setVisibility(View.VISIBLE);
-		TableRow rec7 = (TableRow)findViewById(R.id.TTrainig6);
-		rec7.setVisibility(View.VISIBLE);
-		TableRow rec8 = (TableRow)findViewById(R.id.TTrainig6);
-		rec8.setVisibility(View.VISIBLE);
-		TableRow rec9 = (TableRow)findViewById(R.id.TTrainig6);
-		rec9.setVisibility(View.VISIBLE);
-		
-		tv1.setText(cPlan[0]);
-		tv2.setText(cPlan[1]);
-		tv3.setText(cPlan[2]);
-		tv4.setText(cPlan[3]);
-		tv5.setText(cPlan[4]);
-		tv6.setText(cPlan[5]);
-		tv7.setText(cPlan[6]);
-		tv8.setText(cPlan[7]);
-		tv9.setText("max ("+getText(R.string.TrainingMax)+" "+cPlan[8]+")");		
-	}
-}
+                TableRow rec6 = (TableRow) findViewById(R.id.TTrainig6);
+                rec6.setVisibility(View.VISIBLE);
+                TableRow rec7 = (TableRow) findViewById(R.id.TTrainig6);
+                rec7.setVisibility(View.VISIBLE);
 
+                tv1.setText(cPlan[0]);
+                tv2.setText(cPlan[1]);
+                tv3.setText(cPlan[2]);
+                tv4.setText(cPlan[3]);
+                tv5.setText(cPlan[4]);
+                tv6.setText(cPlan[5]);
+                tv7.setText("max (" + getText(R.string.TrainingMax) + " " + cPlan[6] + ")");
+            }
+        } else if (trainingWeek == 6) {
+            if (trainingDay == 1) {
+                TextView tv1 = (TextView) findViewById(R.id.Trainig1);
+                TextView tv2 = (TextView) findViewById(R.id.Trainig2);
+                TextView tv3 = (TextView) findViewById(R.id.Trainig3);
+                TextView tv4 = (TextView) findViewById(R.id.Trainig4);
+                TextView tv5 = (TextView) findViewById(R.id.Trainig5);
 
+                MakePlan WeekPlan = new MakePlan(trainingLevel, trainingDay, trainingWeek);
+                String[] cPlan = WeekPlan.gettTrainingPlan(this);
 
-Button mFirstRunOk = (Button)findViewById(R.id.BeginTraining);
-mFirstRunOk.setOnClickListener(this);
-}
-	
-	private void saveResult(){
-	final WriteResult wr = new WriteResult(this);
-    wr.setTitle(R.string.EndTraining);
-    wr.setCancelable(false);
-    wr.show();
-	}
-	
+                tv1.setText(cPlan[0]);
+                tv2.setText(cPlan[1]);
+                tv3.setText(cPlan[2]);
+                tv4.setText(cPlan[3]);
+                tv5.setText("max (" + getText(R.string.TrainingMax) + " " + cPlan[4] + ")");
+            } else {
+                TextView tv1 = (TextView) findViewById(R.id.Trainig1);
+                TextView tv2 = (TextView) findViewById(R.id.Trainig2);
+                TextView tv3 = (TextView) findViewById(R.id.Trainig3);
+                TextView tv4 = (TextView) findViewById(R.id.Trainig4);
+                TextView tv5 = (TextView) findViewById(R.id.Trainig5);
+                TextView tv6 = (TextView) findViewById(R.id.Trainig6);
+                TextView tv7 = (TextView) findViewById(R.id.Trainig7);
+                TextView tv8 = (TextView) findViewById(R.id.Trainig8);
+                TextView tv9 = (TextView) findViewById(R.id.Trainig9);
+
+                MakePlan WeekPlan = new MakePlan(trainingLevel, trainingDay, trainingWeek);
+                String[] cPlan = WeekPlan.gettTrainingPlan(this);
+
+                TableRow rec6 = (TableRow) findViewById(R.id.TTrainig6);
+                rec6.setVisibility(View.VISIBLE);
+                TableRow rec7 = (TableRow) findViewById(R.id.TTrainig6);
+                rec7.setVisibility(View.VISIBLE);
+                TableRow rec8 = (TableRow) findViewById(R.id.TTrainig6);
+                rec8.setVisibility(View.VISIBLE);
+                TableRow rec9 = (TableRow) findViewById(R.id.TTrainig6);
+                rec9.setVisibility(View.VISIBLE);
+
+                tv1.setText(cPlan[0]);
+                tv2.setText(cPlan[1]);
+                tv3.setText(cPlan[2]);
+                tv4.setText(cPlan[3]);
+                tv5.setText(cPlan[4]);
+                tv6.setText(cPlan[5]);
+                tv7.setText(cPlan[6]);
+                tv8.setText(cPlan[7]);
+                tv9.setText("max (" + getText(R.string.TrainingMax) + " " + cPlan[8] + ")");
+            }
+        }
+
+
+        Button mFirstRunOk = (Button) findViewById(R.id.BeginTraining);
+        mFirstRunOk.setOnClickListener(this);
+    }
+
+// --Commented out by Inspection START (16.03.10 12:06):
+//	private void saveResult(){
+//	final WriteResult wr = new WriteResult(this);
+//    wr.setTitle(R.string.EndTraining);
+//    wr.setCancelable(false);
+//    wr.show();
+//	}
+// --Commented out by Inspection STOP (16.03.10 12:06)
+
     // Button Listener	
-	public void onClick(View v)
-    {	
-		switch (v.getId())
-    	{
-		case R.id.BeginTraining:
-    	{
-    		SharedPreferences settings = getSharedPreferences("FileSettings", 0);
-    		int trainingWeek = settings.getInt("TrainingWeek", 1);
-    		int trainingDay = settings.getInt("TrainingDay", 1);
-    		int trainingLevel = settings.getInt("TrainingLevel", 0);
-    		
-    		MakePlan WeekPlan = new MakePlan(trainingLevel, trainingDay, trainingWeek);
-    		String[] cPlan = WeekPlan.gettTrainingPlan(this);
-    		
-    		TrainingDialog td = new TrainingDialog(this, trainingWeek,trainingDay,trainingLevel, cPlan);
-    	
+
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.BeginTraining: {
+                SharedPreferences settings = getSharedPreferences("FileSettings", 0);
+                int trainingWeek = settings.getInt("TrainingWeek", 1);
+                int trainingDay = settings.getInt("TrainingDay", 1);
+                int trainingLevel = settings.getInt("TrainingLevel", 0);
+
+                MakePlan WeekPlan = new MakePlan(trainingLevel, trainingDay, trainingWeek);
+                String[] cPlan = WeekPlan.gettTrainingPlan(this);
+
+                TrainingDialog td = new TrainingDialog(this, trainingWeek, trainingDay,/*trainingLevel,*/ cPlan);
+
 /*    		switch(v.getTop()){
-    	case TRAINING:
-    		td.show();
-    		showDialog(SAVING);
-    	case SAVING:
-    		saveResult();
-    	}*/
-    		td.show();
-    		
-    		break;
-    	}
-    	default:
-    		break;
-    	}
+        case TRAINING:
+            td.show();
+            showDialog(SAVING);
+        case SAVING:
+            saveResult();
+        }*/
+                td.show();
+
+                break;
+            }
+            default:
+                break;
+        }
     }
 
 }

File src/ru/d_lab/HundredPushUps/tools/TrainingDialog.java

 /**
- * 
+ *
  */
 package ru.d_lab.HundredPushUps.tools;
 
 import android.widget.Button;
 import android.widget.TextView;
 import ru.d_lab.HundredPushUps.R;
+
 /**
  * @author Old Cyber
- *
  */
 public class TrainingDialog extends Dialog {
-	
-	private Button ok_button; private Button cancel_button;
-	private final int trWeek; private final int trDay;
-	private int iter=0;
-	private final String[] cPlan;
-	
-    public TrainingDialog(Context context, int trWeek, int trDay, int trLevel, String[] cPlan) {
-		super(context);
-		this.trWeek = trWeek;
-		this.trDay = trDay;
-		int trLevel1= trLevel;
-		this.cPlan = cPlan;
-	}
 
-	@Override
-	public void onCreate(Bundle savedInstanceState) { 
+    private Button ok_button;
+    private Button cancel_button;
+    private final int trWeek;
+    private final int trDay;
+    private int iter = 0;
+    private final String[] cPlan;
+
+    public TrainingDialog(Context context, int trWeek, int trDay, /*int trLevel,*/ String[] cPlan) {
+        super(context);
+        this.trWeek = trWeek;
+        this.trDay = trDay;
+        //int trLevel1 = trLevel;
+        this.cPlan = cPlan;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-		setContentView(R.layout.training_dialog);
-		ok_button = (Button) findViewById(R.id.ButtonOk);
-		cancel_button = (Button) findViewById(R.id.ButtonCancel);
+        setContentView(R.layout.training_dialog);
+        ok_button = (Button) findViewById(R.id.ButtonOk);
+        cancel_button = (Button) findViewById(R.id.ButtonCancel);
 
-		// Content begin		
-		tTraining();
-		
-		setOnOkClick(new View.OnClickListener() {
+        // Content begin
+        tTraining();
 
-	@Override
-		public void onClick(View v) {				
-			restTime();
-		}
-	});
+        setOnOkClick(new View.OnClickListener() {
 
-		setOnCancelClick(new View.OnClickListener(){
-			@Override	
-			public void onClick(View v){
-				dismiss();
-			}
-	});	
+            @Override
+            public void onClick(View v) {
+                restTime();
+            }
+        });
 
-}	
+        setOnCancelClick(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dismiss();
+            }
+        });
+
+    }
 // Content End
 //ok listener	
-	void setOnOkClick(View.OnClickListener l) {
-	        ok_button.setOnClickListener(l);
-	}
+
+    void setOnOkClick(View.OnClickListener l) {
+        ok_button.setOnClickListener(l);
+    }
 //cancel listener	
-	void setOnCancelClick(View.OnClickListener l){
-			cancel_button.setOnClickListener(l);
-	}
+
+    void setOnCancelClick(View.OnClickListener l) {
+        cancel_button.setOnClickListener(l);
+    }
 //rest window	
-	void restTime(){
-		RestTime BaiBai = new RestTime(trWeek, trDay);
-		long tRest = BaiBai.getRestTime(this);
-		if (iter < cPlan.length-1){
-		TextView TimeTraining = (TextView)findViewById(R.id.DialogTrainingTex);
-		ok_button.setVisibility(View.INVISIBLE);
-		cancel_button.setVisibility(View.INVISIBLE);
-		final TextView TimeTimer = (TextView)findViewById(R.id.DialogRestTex);
-		TimeTimer.setVisibility(View.VISIBLE);
-		TimeTraining.setVisibility(View.GONE);
-		setTitle(R.string.Rest);
-       new CountDownTimer(tRest, 1000) {
-            public void onTick(long millisUntilFinished) {
-            	TimeTimer.setText("" + millisUntilFinished / 1000 + "");
+
+    void restTime() {
+        RestTime BaiBai = new RestTime(trWeek, trDay);
+        long tRest = BaiBai.getRestTime(this);
+        if (iter < cPlan.length - 1) {
+            TextView TimeTraining = (TextView) findViewById(R.id.DialogTrainingTex);
+            ok_button.setVisibility(View.INVISIBLE);
+            cancel_button.setVisibility(View.INVISIBLE);
+            final TextView TimeTimer = (TextView) findViewById(R.id.DialogRestTex);
+            TimeTimer.setVisibility(View.VISIBLE);
+            TimeTraining.setVisibility(View.GONE);
+            setTitle(R.string.Rest);
+            new CountDownTimer(tRest, 1000) {
+                public void onTick(long millisUntilFinished) {
+                    TimeTimer.setText("" + millisUntilFinished / 1000 + "");
+                }
+
+                public void onFinish() {
+                    iter = iter + 1;
+                    tTraining();
+                }
+            }.start();
+        } else if (iter == cPlan.length - 1) {
+            // do nothing
+            dismiss();
+            //!!! goto save result
+        }
+    }
+//training window
+
+    void tTraining() {
+        if (iter < cPlan.length - 1) {
+            if (iter == 0) {
+                setTitle(R.string.Training1);
+            } else if (iter == 1) {
+                setTitle(R.string.Training2);
+            } else if (iter == 2) {
+                setTitle(R.string.Training3);
+            } else if (iter == 3) {
+                setTitle(R.string.Training4);
+            } else if (iter == 4) {
+                setTitle(R.string.Training5);
+            } else if (iter == 5) {
+                setTitle(R.string.Training6);
+            } else if (iter == 6) {
+                setTitle(R.string.Training7);
+            } else if (iter == 7) {
+                setTitle(R.string.Training8);
+            } else if (iter == 8) {
+                setTitle(R.string.Training9);
+            } else {
+                //wrong!
             }
+            TextView TimeTraining = (TextView) findViewById(R.id.DialogTrainingTex);
+            TextView TimeTimer = (TextView) findViewById(R.id.DialogRestTex);
+            ok_button.setVisibility(View.VISIBLE);
+            cancel_button.setVisibility(View.VISIBLE);
+            TimeTimer.setVisibility(View.GONE);
+            TimeTraining.setVisibility(View.VISIBLE);
+            TimeTraining.setText(cPlan[iter]);
+        } else if (iter == cPlan.length - 1) {
+            setTitle(R.string.TrainingMax);
 
-            public void onFinish() {
-            	iter = iter + 1;
-            	tTraining();
-            }
-         }.start();
-		}
-		else if (iter == cPlan.length-1){
-			// do nothing
-			dismiss();
-			//!!! goto save result
-		}
-	}
-//training window
-	void tTraining(){
-		if (iter < cPlan.length-1)
-		{
-			if (iter == 0){
-				setTitle(R.string.Training1);
-			}
-			else if (iter == 1){
-				setTitle(R.string.Training2);
-			}
-			else if (iter == 2){
-				setTitle(R.string.Training3);
-			}
-			else if (iter == 3){
-				setTitle(R.string.Training4);
-			}
-			else if (iter == 4){
-				setTitle(R.string.Training5);
-			}
-			else if (iter == 5){
-				setTitle(R.string.Training6);
-			}
-			else if (iter == 6){
-				setTitle(R.string.Training7);
-			}
-			else if (iter == 7){
-				setTitle(R.string.Training8);
-			}
-			else if (iter == 8){
-				setTitle(R.string.Training9);
-			}
-			else {
-				//wrong!
-			}
-			TextView TimeTraining = (TextView)findViewById(R.id.DialogTrainingTex);
-			TextView TimeTimer = (TextView)findViewById(R.id.DialogRestTex);
-			ok_button.setVisibility(View.VISIBLE);
-			cancel_button.setVisibility(View.VISIBLE);
-			TimeTimer.setVisibility(View.GONE);
-			TimeTraining.setVisibility(View.VISIBLE);
-			TimeTraining.setText(cPlan[iter]);
-		}
-		else if (iter == cPlan.length-1)
-		{
-			setTitle(R.string.TrainingMax);
-			
-			TextView TimeTraining = (TextView)findViewById(R.id.DialogTrainingTex);
-			TextView TimeTimer = (TextView)findViewById(R.id.DialogRestTex);
-			ok_button.setVisibility(View.VISIBLE);
-			cancel_button.setVisibility(View.VISIBLE);
-			TimeTimer.setVisibility(View.GONE);
-			TimeTraining.setVisibility(View.VISIBLE);
-			TimeTraining.setText(cPlan[iter]);
-		}
-		else 
-		{
-			dismiss();
-		}
-	}
+            TextView TimeTraining = (TextView) findViewById(R.id.DialogTrainingTex);
+            TextView TimeTimer = (TextView) findViewById(R.id.DialogRestTex);
+            ok_button.setVisibility(View.VISIBLE);
+            cancel_button.setVisibility(View.VISIBLE);
+            TimeTimer.setVisibility(View.GONE);
+            TimeTraining.setVisibility(View.VISIBLE);
+            TimeTraining.setText(cPlan[iter]);
+        } else {
+            dismiss();
+        }
+    }
 
-	/** @noinspection EmptyMethod*/
-    public void saveResult(){
-		
-	}
+// --Commented out by Inspection START (16.03.10 10:25):
+//    /**
+//     * @noinspection EmptyMethod
+//     */
+//    public void saveResult() {
+//
+//    }
+// --Commented out by Inspection STOP (16.03.10 10:25)
 }

File src/ru/d_lab/HundredPushUps/tools/WriteResult.java

 /**
- * 
+ *
  */
 package ru.d_lab.HundredPushUps.tools;
 
-import ru.d_lab.HundredPushUps.R;
 import android.app.Activity;
 import android.app.Dialog;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
+import ru.d_lab.HundredPushUps.R;
 
 /**
  * @author Old Cyber
- *
  */
-public class WriteResult extends Dialog {
-	
-	public static final String TAG = "WriteResultDialog";
-	private final Button ok_button;
+class WriteResult extends Dialog {
+
+    // --Commented out by Inspection (16.03.10 12:07):public static final String TAG = "WriteResultDialog";
+    private final Button ok_button;
     private final Button cancel_button;
-    
-	public WriteResult(final Activity activity) {
-		super(activity);
-        
-		setContentView(R.layout.writeresult);
+
+    public WriteResult(final Activity activity) {
+        super(activity);
+
+        setContentView(R.layout.writeresult);
         ok_button = (Button) findViewById(R.id.button_save);
         cancel_button = (Button) findViewById(R.id.button_cancel);
-	
+
         setOnCancelClick(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 activity.finish();
             }
         });
-	
+
         setOnSaveClick(new View.OnClickListener() {
-			
-			@Override
-			public void onClick(View v) {
-				// TODO Auto-generated method stub
-				
-			}
-		});
-	
-	
-	
-	
-	}
-	
-	
-	   void setOnSaveClick(View.OnClickListener l) {
-	        ok_button.setOnClickListener(l);
-	    }
 
-	    void setOnCancelClick(View.OnClickListener l) {
-	        cancel_button.setOnClickListener(l);
-	    }
-	    public String getLogin() {
-	        return ((TextView) findViewById(R.id.Result)).getText().toString();
-	    }
+            @Override
+            public void onClick(View v) {
+                // TODO Auto-generated method stub
+
+            }
+        });
+
+
+    }
+
+    void setOnSaveClick(View.OnClickListener l) {
+        ok_button.setOnClickListener(l);
+    }
+
+    void setOnCancelClick(View.OnClickListener l) {
+        cancel_button.setOnClickListener(l);
+    }
+
+    public String getLogin() {
+        return ((TextView) findViewById(R.id.Result)).getText().toString();
+    }
 
 
 }