From e57ce8cf2cb9be15ca2a5faab8c44eb900e4c283 Mon Sep 17 00:00:00 2001 From: Sergey Solovyev Date: Sat, 15 Jun 2013 00:31:49 +0400 Subject: [PATCH] code reformat --- android-app-core/AndroidManifest.xml | 9 +- android-app-core/pom.xml | 82 +- android-app-core/res/drawable/blue_button.xml | 5 +- .../res/drawable/blue_button_dark.xml | 5 +- .../res/drawable/blue_button_dark_shape.xml | 9 +- .../res/drawable/blue_button_shape.xml | 9 +- .../default_abs__btn_cab_done_holo_dark.xml | 12 +- ...default_abs__item_background_holo_dark.xml | 17 +- ...lector_background_transition_holo_dark.xml | 7 +- .../default_abs__list_selector_holo_dark.xml | 17 +- .../default_abs__spinner_ab_holo_dark.xml | 14 +- .../default_abs__tab_indicator_ab_holo.xml | 29 +- android-app-core/res/drawable/gray_button.xml | 5 +- .../res/drawable/gray_button_dark.xml | 5 +- .../res/drawable/gray_button_dark_shape.xml | 9 +- .../res/drawable/gray_button_shape.xml | 9 +- .../metro_blue_abs__tab_indicator_ab_holo.xml | 29 +- .../res/drawable/metro_blue_button.xml | 5 +- .../res/drawable/metro_blue_button_shape.xml | 7 +- .../res/drawable/metro_blue_list_item.xml | 26 +- .../res/drawable/metro_button_dark.xml | 5 +- .../res/drawable/metro_button_dark_shape.xml | 7 +- .../res/drawable/metro_button_green.xml | 5 +- .../res/drawable/metro_button_green_shape.xml | 7 +- .../res/drawable/metro_button_light.xml | 5 +- .../res/drawable/metro_button_light_shape.xml | 7 +- .../res/drawable/metro_button_pressed.xml | 7 +- .../res/drawable/metro_button_purple.xml | 5 +- .../drawable/metro_button_purple_shape.xml | 7 +- .../res/drawable/metro_green_list_item.xml | 26 +- .../res/drawable/metro_purple_list_item.xml | 26 +- .../res/drawable/pane_background.xml | 7 +- .../res/drawable/violet_button.xml | 5 +- .../res/drawable/violet_button_dark.xml | 5 +- .../res/drawable/violet_button_dark_shape.xml | 9 +- .../res/drawable/violet_button_shape.xml | 9 +- .../layout/cpp_fixable_messages_dialog.xml | 43 +- .../cpp_fixable_messages_dialog_message.xml | 33 +- .../res/layout/cpp_simple_button_0.xml | 6 +- .../res/layout/cpp_simple_button_1.xml | 6 +- .../res/layout/cpp_simple_button_2.xml | 6 +- .../res/layout/cpp_simple_button_3.xml | 6 +- .../res/layout/cpp_simple_button_4.xml | 6 +- .../res/layout/cpp_simple_button_5.xml | 6 +- .../res/layout/cpp_simple_button_6.xml | 6 +- .../res/layout/cpp_simple_button_7.xml | 6 +- .../res/layout/cpp_simple_button_8.xml | 6 +- .../res/layout/cpp_simple_button_9.xml | 6 +- .../res/layout/cpp_simple_button_app.xml | 8 +- .../res/layout/cpp_simple_button_clear.xml | 8 +- .../res/layout/cpp_simple_button_copy.xml | 8 +- .../res/layout/cpp_simple_button_division.xml | 6 +- .../res/layout/cpp_simple_button_dot.xml | 6 +- .../res/layout/cpp_simple_button_equals.xml | 9 +- .../res/layout/cpp_simple_button_erase.xml | 8 +- .../layout/cpp_simple_button_functions.xml | 8 +- .../res/layout/cpp_simple_button_history.xml | 8 +- .../res/layout/cpp_simple_button_left.xml | 6 +- .../res/layout/cpp_simple_button_like.xml | 8 +- .../cpp_simple_button_multiplication.xml | 6 +- .../res/layout/cpp_simple_button_paste.xml | 8 +- .../res/layout/cpp_simple_button_percent.xml | 6 +- .../res/layout/cpp_simple_button_plus.xml | 6 +- .../res/layout/cpp_simple_button_power.xml | 6 +- .../res/layout/cpp_simple_button_right.xml | 6 +- .../cpp_simple_button_round_brackets.xml | 6 +- .../res/layout/cpp_simple_button_settings.xml | 8 +- .../layout/cpp_simple_button_subtraction.xml | 6 +- .../res/layout/cpp_simple_button_vars.xml | 8 +- .../res/layout/cpp_simple_keyboard.xml | 136 ++- .../res/layout/cpp_unit_converter.xml | 128 +-- .../res/layout/main_calculator.xml | 7 +- .../res/layout/main_calculator_mobile.xml | 7 +- android-app-core/res/values-es/text_about.xml | 12 +- .../res/values-es/text_functions.xml | 35 +- android-app-core/res/values-es/text_help.xml | 56 +- .../res/values-es/text_operators.xml | 21 +- .../res/values-es/text_strings.xml | 19 +- android-app-core/res/values-es/text_vars.xml | 20 +- android-app-core/res/values-it/text_about.xml | 9 +- .../res/values-it/text_functions.xml | 36 +- android-app-core/res/values-it/text_help.xml | 62 +- .../res/values-it/text_operators.xml | 14 +- .../res/values-it/text_strings.xml | 35 +- android-app-core/res/values-it/text_vars.xml | 20 +- android-app-core/res/values-ru/text_about.xml | 149 +-- .../res/values-ru/text_functions.xml | 20 +- android-app-core/res/values-ru/text_help.xml | 64 +- .../res/values-ru/text_operators.xml | 18 +- .../res/values-ru/text_preferences.xml | 30 +- .../res/values-ru/text_strings.xml | 321 +++--- android-app-core/res/values-ru/text_vars.xml | 16 +- android-app-core/res/values-uk/text_about.xml | 85 +- .../res/values-uk/text_functions.xml | 35 +- android-app-core/res/values-uk/text_help.xml | 59 +- .../res/values-uk/text_operators.xml | 11 +- .../res/values-uk/text_preferences.xml | 15 +- .../res/values-uk/text_strings.xml | 60 +- android-app-core/res/values-uk/text_vars.xml | 20 +- .../res/values-zh-rtw/text_about.xml | 50 +- .../res/values-zh-rtw/text_help.xml | 36 +- .../res/values-zh-rtw/text_operators.xml | 4 +- .../res/values-zh-rtw/text_preferences.xml | 12 +- .../res/values-zh-rtw/text_strings.xml | 37 +- android-app-core/res/values/arrays.xml | 12 +- android-app-core/res/values/colors.xml | 26 +- android-app-core/res/values/dimens.xml | 40 +- android-app-core/res/values/ids.xml | 64 +- android-app-core/res/values/preferences.xml | 4 +- android-app-core/res/values/styles.xml | 135 ++- android-app-core/res/values/text_about.xml | 158 +-- .../res/values/text_functions.xml | 30 +- android-app-core/res/values/text_help.xml | 54 +- .../res/values/text_operators.xml | 17 +- .../res/values/text_preferences.xml | 27 +- android-app-core/res/values/text_strings.xml | 275 ++--- android-app-core/res/values/text_vars.xml | 20 +- android-app-core/res/values/theme_gray.xml | 280 +++-- .../res/values/theme_light_blue.xml | 3 +- .../res/values/theme_metro_blue.xml | 52 +- .../res/values/theme_metro_green.xml | 14 +- .../res/values/theme_metro_purple.xml | 12 +- android-app-core/res/values/theme_violet.xml | 6 +- .../org/solovyev/android/AndroidUtils2.java | 6 +- .../AndroidCalculatorDisplayView.java | 222 ++-- .../AndroidCalculatorEditorView.java | 298 +++--- .../android/calculator/CalculatorButton.java | 154 +-- .../android/calculator/CalculatorButtons.java | 354 +++---- .../calculator/CalculatorDisplayMenuItem.java | 164 +-- .../CalculatorDisplayOnClickListener.java | 56 +- .../calculator/CalculatorPreferences.java | 294 +++--- .../calculator/ConversionMenuItem.java | 56 +- .../calculator/DigitButtonDragProcessor.java | 12 +- .../android/calculator/FixableMessage.java | 110 +- .../calculator/FixableMessagesDialog.java | 307 +++--- .../ParcelableCalculatorDisplayViewState.java | 158 +-- .../ParcelableCalculatorEditorViewState.java | 86 +- .../calculator/ParcelableDialogData.java | 160 +-- .../AndroidExternalListenersContainer.java | 130 +-- ...efaultExternalCalculatorIntentHandler.java | 114 +- .../ExternalCalculatorIntentHandler.java | 2 +- .../ExternalCalculatorStateUpdater.java | 6 +- .../model/AndroidCalculatorEngine.java | 388 +++---- .../model/AndroidMathEntityDao.java | 120 +-- .../plot/AndroidCalculatorPlotter.java | 244 ++--- .../calculator/plot/AndroidPlotLineStyle.java | 78 +- .../view/NumeralBaseConverterDialog.java | 114 +- .../calculator/view/TextHighlighter.java | 28 +- .../view/UnitConverterViewBuilder.java | 303 +++--- android-app-onscreen/AndroidManifest.xml | 9 +- android-app-onscreen/pom.xml | 80 +- .../res/layout/onscreen_display.xml | 17 +- .../res/layout/onscreen_editor.xml | 18 +- .../res/layout/onscreen_footer.xml | 6 +- .../res/layout/onscreen_header.xml | 53 +- .../res/layout/onscreen_keyboard.xml | 114 +- .../res/layout/onscreen_layout.xml | 62 +- android-app-onscreen/res/values/colors.xml | 2 +- android-app-onscreen/res/values/styles.xml | 6 +- .../CalculatorOnscreenBroadcastReceiver.java | 40 +- .../onscreen/CalculatorOnscreenService.java | 260 ++--- .../CalculatorOnscreenStartActivity.java | 10 +- .../onscreen/CalculatorOnscreenView.java | 860 ++++++++-------- .../onscreen/CalculatorOnscreenViewState.java | 228 ++-- .../onscreen/OnscreenViewListener.java | 8 +- android-app-test/pom.xml | 19 +- android-app-widget/AndroidManifest.xml | 9 +- android-app-widget/pom.xml | 38 +- .../res/layout/widget_display.xml | 15 +- .../res/layout/widget_editor.xml | 24 +- .../res/layout/widget_layout.xml | 55 +- android-app-widget/res/values/colors.xml | 2 +- android-app-widget/res/values/dimens.xml | 6 +- android-app-widget/res/values/styles.xml | 20 +- .../AbstractCalculatorWidgetProvider.java | 218 ++-- .../widget/CalculatorWidgetIntentHandler.java | 32 +- android-app/AndroidManifest.xml | 383 ++++--- android-app/pom.xml | 479 ++++----- android-app/proguard.cfg | 6 +- .../res/layout-land/cpp_app_keyboard.xml | 102 +- .../layout-land/cpp_app_keyboard_mobile.xml | 102 +- .../res/layout-land/main_calculator.xml | 11 +- .../layout-land/main_calculator_mobile.xml | 11 +- .../res/layout-land/main_first_pane.xml | 93 +- .../layout-land/main_first_pane_mobile.xml | 93 +- .../layout-large-land/cpp_app_keyboard.xml | 120 ++- .../res/layout-large-land/main_calculator.xml | 83 +- .../res/layout-large/cpp_app_display.xml | 31 +- .../res/layout-large/cpp_app_editor.xml | 29 +- .../res/layout-large/cpp_app_keyboard.xml | 122 ++- .../res/layout-large/main_calculator.xml | 83 +- .../layout-xlarge-land/cpp_app_keyboard.xml | 106 +- .../layout-xlarge-land/main_calculator.xml | 83 +- .../res/layout-xlarge/cpp_app_display.xml | 31 +- .../res/layout-xlarge/cpp_app_editor.xml | 29 +- .../res/layout-xlarge/cpp_app_keyboard.xml | 134 ++- .../res/layout-xlarge/main_calculator.xml | 83 +- android-app/res/layout/about_fragment.xml | 37 +- android-app/res/layout/ad.xml | 6 +- android-app/res/layout/calc_plot_view.xml | 8 +- .../res/layout/cpp_app_button_copy.xml | 8 +- .../res/layout/cpp_app_button_donate.xml | 8 +- .../res/layout/cpp_app_button_erase.xml | 8 +- .../res/layout/cpp_app_button_paste.xml | 8 +- android-app/res/layout/cpp_app_display.xml | 17 +- .../res/layout/cpp_app_display_mobile.xml | 17 +- android-app/res/layout/cpp_app_editor.xml | 24 +- .../res/layout/cpp_app_editor_mobile.xml | 24 +- android-app/res/layout/cpp_app_keyboard.xml | 121 ++- .../res/layout/cpp_app_keyboard_mobile.xml | 121 ++- android-app/res/layout/cpp_dialog.xml | 6 +- .../res/layout/cpp_dialog_fragment.xml | 60 +- android-app/res/layout/cpp_drag_button_0.xml | 16 +- android-app/res/layout/cpp_drag_button_1.xml | 16 +- android-app/res/layout/cpp_drag_button_2.xml | 16 +- android-app/res/layout/cpp_drag_button_3.xml | 16 +- android-app/res/layout/cpp_drag_button_4.xml | 16 +- android-app/res/layout/cpp_drag_button_5.xml | 16 +- android-app/res/layout/cpp_drag_button_6.xml | 18 +- android-app/res/layout/cpp_drag_button_7.xml | 17 +- android-app/res/layout/cpp_drag_button_8.xml | 17 +- android-app/res/layout/cpp_drag_button_9.xml | 17 +- .../res/layout/cpp_drag_button_clear.xml | 18 +- .../res/layout/cpp_drag_button_division.xml | 16 +- .../res/layout/cpp_drag_button_dot.xml | 14 +- .../res/layout/cpp_drag_button_empty.xml | 4 +- .../res/layout/cpp_drag_button_equals.xml | 23 +- .../res/layout/cpp_drag_button_functions.xml | 16 +- .../res/layout/cpp_drag_button_history.xml | 18 +- .../res/layout/cpp_drag_button_left.xml | 14 +- .../layout/cpp_drag_button_multiplication.xml | 18 +- .../res/layout/cpp_drag_button_operators.xml | 8 +- .../res/layout/cpp_drag_button_plus.xml | 16 +- .../res/layout/cpp_drag_button_right.xml | 14 +- .../layout/cpp_drag_button_round_brackets.xml | 18 +- .../layout/cpp_drag_button_subtraction.xml | 14 +- .../res/layout/cpp_drag_button_vars.xml | 16 +- android-app/res/layout/cpp_plot_fragment.xml | 19 +- .../layout/cpp_plot_function_list_item.xml | 46 +- .../cpp_plot_function_settings_dialog.xml | 4 +- .../cpp_plot_function_settings_fragment.xml | 81 +- .../layout/cpp_plot_functions_fragment.xml | 64 +- .../res/layout/cpp_plot_range_fragment.xml | 168 +-- .../layout/cpp_purchase_dialog_fragment.xml | 36 +- .../res/layout/display_error_message.xml | 27 +- .../res/layout/drag_button_calibration.xml | 86 +- android-app/res/layout/feedback.xml | 15 +- android-app/res/layout/function_add_param.xml | 26 +- android-app/res/layout/function_edit.xml | 139 +-- .../res/layout/function_edit_param.xml | 56 +- android-app/res/layout/help_faq_fragment.xml | 40 +- .../res/layout/help_hints_fragment.xml | 40 +- .../res/layout/help_screens_fragment.xml | 40 +- android-app/res/layout/history_edit.xml | 68 +- android-app/res/layout/history_fragment.xml | 21 +- android-app/res/layout/history_item.xml | 55 +- android-app/res/layout/main_calculator.xml | 60 +- .../res/layout/main_calculator_mobile.xml | 60 +- android-app/res/layout/main_empty.xml | 4 +- .../res/layout/main_empty_multi_pane.xml | 4 +- .../res/layout/math_entities_fragment.xml | 21 +- android-app/res/layout/math_entity.xml | 30 +- .../res/layout/matrix_edit_fragment.xml | 86 +- .../res/layout/matrix_edit_fragment_item.xml | 13 +- android-app/res/layout/notespp_announce.xml | 15 +- .../res/layout/release_notes_fragment.xml | 22 +- android-app/res/layout/saved_history_item.xml | 55 +- android-app/res/layout/tabs.xml | 32 +- android-app/res/layout/var_edit.xml | 122 ++- android-app/res/layout/vars_fragment.xml | 21 +- android-app/res/menu/functions_menu.xml | 9 +- android-app/res/menu/history_menu.xml | 7 +- android-app/res/menu/plot_menu.xml | 54 +- android-app/res/menu/vars_menu.xml | 9 +- android-app/res/values-large-hdpi/dimens.xml | 12 +- android-app/res/values-large-mdpi/dimens.xml | 12 +- android-app/res/values-large-tvdpi/dimens.xml | 12 +- android-app/res/values-large/dimens.xml | 8 +- android-app/res/values-normal-hdpi/dimens.xml | 4 +- android-app/res/values-normal-mdpi/dimens.xml | 4 +- .../res/values-normal-tvdpi/dimens.xml | 4 +- .../res/values-normal-xhdpi/dimens.xml | 4 +- android-app/res/values-normal/dimens.xml | 16 +- android-app/res/values-small-hdpi/dimens.xml | 4 +- android-app/res/values-small-xhdpi/dimens.xml | 4 +- android-app/res/values-small/dimens.xml | 16 +- android-app/res/values-v14/dimens.xml | 2 +- android-app/res/values-xlarge-hdpi/dimens.xml | 12 +- android-app/res/values-xlarge-mdpi/dimens.xml | 12 +- android-app/res/values-xlarge/dimens.xml | 8 +- android-app/res/values/preferences.xml | 22 +- android-app/res/values/styles_history.xml | 5 +- android-app/res/values/styles_var.xml | 15 +- .../res/xml/calculator_widget_info_3x3.xml | 10 +- .../res/xml/calculator_widget_info_3x4.xml | 10 +- .../res/xml/calculator_widget_info_4x4.xml | 10 +- .../res/xml/calculator_widget_info_4x5.xml | 10 +- android-app/res/xml/preferences.xml | 12 +- .../res/xml/preferences_appearance.xml | 155 +-- .../res/xml/preferences_calculations.xml | 125 +-- android-app/res/xml/preferences_onscreen.xml | 22 +- android-app/res/xml/preferences_other.xml | 35 +- android-app/res/xml/preferences_plot.xml | 14 +- .../calculator/AbstractCalculatorHelper.java | 346 +++---- .../android/calculator/AndroidCalculator.java | 332 +++--- .../AndroidCalculatorClipboard.java | 48 +- .../calculator/AndroidCalculatorKeyboard.java | 106 +- .../calculator/AndroidCalculatorLogger.java | 44 +- .../calculator/AndroidCalculatorNotifier.java | 86 +- .../AndroidCalculatorPreferenceService.java | 106 +- .../calculator/AndroidFunctionCategory.java | 42 +- .../calculator/AndroidNumeralBase.java | 148 +-- .../calculator/AndroidOperatorCategory.java | 40 +- .../calculator/AndroidVarCategory.java | 36 +- .../calculator/CalculatorActivity.java | 424 ++++---- .../calculator/CalculatorActivityHelper.java | 71 +- .../CalculatorActivityHelperImpl.java | 474 ++++----- .../CalculatorActivityLauncher.java | 345 +++---- .../calculator/CalculatorActivityMobile.java | 18 +- .../calculator/CalculatorApplication.java | 297 +++--- .../calculator/CalculatorDialogActivity.java | 162 +-- .../calculator/CalculatorDisplayFragment.java | 86 +- .../calculator/CalculatorEditorFragment.java | 150 +-- .../calculator/CalculatorFragment.java | 110 +- .../CalculatorFragmentActivity.java | 74 +- .../calculator/CalculatorFragmentHelper.java | 18 +- .../CalculatorFragmentHelperImpl.java | 182 ++-- .../calculator/CalculatorFragmentType.java | 99 +- .../CalculatorKeyboardFragment.java | 168 +-- .../android/calculator/CalculatorMenu.java | 110 +- .../calculator/CursorDragProcessor.java | 4 +- .../calculator/EqualsDragProcessor.java | 22 +- .../calculator/NumeralBaseButtons.java | 34 +- .../about/CalculatorAboutActivity.java | 12 +- .../about/CalculatorAboutFragment.java | 18 +- .../about/CalculatorReleaseNotesFragment.java | 30 +- .../android/calculator/about/TextHelper.java | 36 +- .../function/FunctionEditDialogFragment.java | 270 ++--- .../function/FunctionEditorSaver.java | 38 +- .../function/FunctionParamsView.java | 10 +- .../help/CalculatorHelpActivity.java | 14 +- .../AbstractCalculatorHistoryFragment.java | 342 +++--- .../history/AndroidCalculatorHistory.java | 186 ++-- .../history/CalculatorHistoryActivity.java | 71 +- .../history/CalculatorHistoryFragment.java | 18 +- .../CalculatorSavedHistoryFragment.java | 10 +- .../history/HistoryArrayAdapter.java | 10 +- .../history/HistoryItemMenuData.java | 8 +- .../history/HistoryItemMenuItem.java | 16 +- .../history/TextViewEditorAdapter.java | 2 +- .../edit/AbstractMathEntityListFragment.java | 467 +++++---- .../edit/CalculatorFunctionsActivity.java | 117 ++- .../edit/CalculatorFunctionsFragment.java | 280 ++--- .../edit/CalculatorOperatorsActivity.java | 89 +- .../edit/CalculatorOperatorsFragment.java | 150 +-- .../math/edit/CalculatorVarsActivity.java | 119 ++- .../math/edit/CalculatorVarsFragment.java | 409 ++++---- .../math/edit/MathEntityRemover.java | 212 ++-- .../math/edit/VarEditDialogFragment.java | 304 +++--- .../calculator/math/edit/VarEditorSaver.java | 128 +-- .../matrix/CalculatorMatrixActivity.java | 12 +- .../matrix/CalculatorMatrixEditFragment.java | 184 ++-- .../android/calculator/matrix/MatrixView.java | 438 ++++---- .../plot/AbstractCalculatorPlotFragment.java | 454 ++++---- .../plot/AbstractGraphCalculator.java | 166 +-- .../plot/CalculatorGraph2dView.java | 971 +++++++++--------- .../plot/CalculatorGraph3dView.java | 625 +++++------ .../plot/CalculatorPlotActivity.java | 34 +- .../plot/CalculatorPlotFragment.java | 138 +-- ...alculatorPlotFunctionSettingsActivity.java | 224 ++-- .../plot/CalculatorPlotFunctionsActivity.java | 12 +- .../CalculatorPlotPreferenceActivity.java | 12 +- .../plot/CalculatorPlotRangeActivity.java | 102 +- .../solovyev/android/calculator/plot/FPS.java | 32 +- .../android/calculator/plot/GLText.java | 645 ++++++------ .../android/calculator/plot/GLView.java | 311 +++--- .../calculator/plot/Graph2dDimensions.java | 358 +++---- .../android/calculator/plot/Graph3d.java | 562 +++++----- .../calculator/plot/GraphCalculator.java | 12 +- .../calculator/plot/GraphCalculatorImpl.java | 144 +-- .../android/calculator/plot/GraphData.java | 254 ++--- .../android/calculator/plot/GraphView.java | 47 +- .../calculator/plot/GraphViewHelper.java | 66 +- .../android/calculator/plot/GraphsData.java | 112 +- .../calculator/plot/PlotFunctionListItem.java | 118 +-- .../android/calculator/plot/PlotViewDef.java | 98 +- .../android/calculator/plot/SpriteBatch.java | 203 ++-- .../calculator/plot/TexampleRenderer.java | 122 +-- .../calculator/plot/TextureRegion.java | 28 +- .../android/calculator/plot/TouchHandler.java | 134 +-- .../android/calculator/plot/Vertices.java | 449 ++++---- .../android/calculator/plot/ZoomTracker.java | 82 +- .../CalculatorPreferencesActivity.java | 40 +- .../CalculatorPurchaseDialogActivity.java | 86 +- .../view/CalculatorAdditionalTitle.java | 4 +- .../view/OnDragListenerVibrator.java | 42 +- .../android/fragments/FragmentUtils.java | 114 +- .../android/AndroidNumeralBaseTest.java | 84 +- .../AndroidCalculatorEditorViewTest.java | 20 +- .../calculator/CalculatorTestUtils.java | 56 +- .../calculator/CalculatorppTestRunner.java | 6 +- .../calculator/TextHighlighterTest.java | 58 +- .../calculator/history/HistoryUtilsTest.java | 12 +- .../plot/CalculatorGraph2dViewTest.java | 32 +- core/pom.xml | 94 +- .../AbstractCalculatorMathRegistry.java | 99 +- .../calculator/AbstractNumberBuilder.java | 32 +- .../android/calculator/Calculator.java | 82 +- .../calculator/CalculatorClipboard.java | 8 +- .../CalculatorConversionEventData.java | 18 +- .../CalculatorConversionEventDataImpl.java | 142 +-- .../android/calculator/CalculatorDisplay.java | 16 +- .../CalculatorDisplayChangeEventDataImpl.java | 36 +- .../calculator/CalculatorDisplayImpl.java | 248 ++--- .../calculator/CalculatorDisplayView.java | 6 +- .../CalculatorDisplayViewState.java | 24 +- .../CalculatorDisplayViewStateImpl.java | 184 ++-- .../android/calculator/CalculatorEditor.java | 117 +-- .../CalculatorEditorChangeEventData.java | 2 +- .../CalculatorEditorChangeEventDataImpl.java | 38 +- .../calculator/CalculatorEditorImpl.java | 488 ++++----- .../calculator/CalculatorEditorView.java | 2 +- .../calculator/CalculatorEditorViewState.java | 6 +- .../CalculatorEditorViewStateImpl.java | 70 +- .../android/calculator/CalculatorEngine.java | 106 +- .../calculator/CalculatorEngineImpl.java | 490 ++++----- .../CalculatorEvaluationEventData.java | 8 +- .../CalculatorEvaluationEventDataImpl.java | 96 +- .../calculator/CalculatorEventContainer.java | 62 +- .../calculator/CalculatorEventData.java | 20 +- .../calculator/CalculatorEventDataImpl.java | 118 +-- .../calculator/CalculatorEventHolder.java | 100 +- .../calculator/CalculatorEventListener.java | 2 +- .../calculator/CalculatorEventType.java | 242 ++--- .../android/calculator/CalculatorFailure.java | 12 +- .../calculator/CalculatorFailureImpl.java | 48 +- .../calculator/CalculatorFixableError.java | 64 +- .../CalculatorFunctionsMathRegistry.java | 45 +- .../android/calculator/CalculatorImpl.java | 868 ++++++++-------- .../android/calculator/CalculatorInput.java | 8 +- .../calculator/CalculatorInputImpl.java | 36 +- .../calculator/CalculatorKeyboard.java | 14 +- .../calculator/CalculatorKeyboardImpl.java | 180 ++-- .../android/calculator/CalculatorLocator.java | 64 +- .../android/calculator/CalculatorLogger.java | 8 +- .../calculator/CalculatorMathEngine.java | 24 +- .../calculator/CalculatorMathRegistry.java | 4 +- .../android/calculator/CalculatorMessage.java | 46 +- .../calculator/CalculatorMessages.java | 74 +- .../calculator/CalculatorNotifier.java | 8 +- .../CalculatorOperatorsMathRegistry.java | 42 +- .../android/calculator/CalculatorOutput.java | 14 +- .../calculator/CalculatorOutputImpl.java | 84 +- .../calculator/CalculatorParseException.java | 8 +- .../CalculatorPostfixFunctionsRegistry.java | 23 +- .../CalculatorPreferenceService.java | 12 +- .../calculator/CalculatorSpecialButton.java | 284 ++--- .../android/calculator/CalculatorUtils.java | 38 +- .../calculator/CalculatorVarsRegistry.java | 81 +- .../solovyev/android/calculator/Change.java | 8 +- .../android/calculator/ChangeImpl.java | 46 +- .../android/calculator/ConversionFailure.java | 4 +- .../calculator/ConversionFailureImpl.java | 20 +- .../android/calculator/DialogData.java | 10 +- .../calculator/DummyCalculatorClipboard.java | 20 +- .../calculator/DummyCalculatorNotifier.java | 24 +- .../solovyev/android/calculator/Editor.java | 2 +- .../android/calculator/FixableError.java | 2 +- .../android/calculator/FunctionCategory.java | 116 +-- .../ListCalculatorEventContainer.java | 56 +- .../solovyev/android/calculator/Locator.java | 216 ++-- .../android/calculator/MathEntityDao.java | 10 +- .../MathEntityPersistenceContainer.java | 2 +- .../android/calculator/MessageDialogData.java | 54 +- .../android/calculator/NumberBuilder.java | 9 +- .../android/calculator/OperatorCategory.java | 106 +- .../calculator/PreparedExpression.java | 2 +- .../android/calculator/StringDialogData.java | 60 +- .../calculator/SystemOutCalculatorLogger.java | 48 +- .../calculator/ToJsclTextProcessor.java | 42 +- .../android/calculator/VarCategory.java | 14 +- .../function/FunctionBuilderAdapter.java | 66 +- .../history/AbstractHistoryState.java | 4 +- .../CalculatorDisplayHistoryState.java | 12 +- .../calculator/history/CalculatorHistory.java | 28 +- .../history/CalculatorHistoryImpl.java | 362 +++---- .../history/CalculatorHistoryState.java | 35 +- .../history/EditorHistoryState.java | 18 +- .../android/calculator/math/MathType.java | 65 +- .../android/calculator/model/AFunction.java | 48 +- .../calculator/model/MathEntityBuilder.java | 8 +- .../android/calculator/model/Var.java | 8 +- .../calculator/plot/CalculatorPlotter.java | 71 +- .../plot/CalculatorPlotterImpl.java | 616 +++++------ .../calculator/plot/FunctionEvaluator.java | 19 +- .../plot/MapPlotResourceManager.java | 158 +-- .../calculator/plot/PlotBoundaries.java | 154 +-- .../android/calculator/plot/PlotData.java | 46 +- .../android/calculator/plot/PlotFunction.java | 150 +-- .../calculator/plot/PlotLineColor.java | 34 +- .../calculator/plot/PlotLineColorType.java | 2 +- .../android/calculator/plot/PlotLineDef.java | 172 ++-- .../calculator/plot/PlotLineStyle.java | 8 +- .../calculator/plot/PlotResourceManager.java | 10 +- .../android/calculator/plot/PlotUtils.java | 56 +- .../android/calculator/plot/XyFunction.java | 266 ++--- .../text/FromJsclSimplifyTextProcessor.java | 6 +- .../units/CalculatorNumeralBase.java | 116 +-- .../calculator/AbstractCalculatorTest.java | 4 +- .../CalculatorDisplayViewStateImplTest.java | 16 +- .../calculator/CalculatorEditorImplTest.java | 280 ++--- .../CalculatorEditorViewStateImplTest.java | 14 +- .../calculator/CalculatorImplTest.java | 38 +- .../calculator/CalculatorTestUtils.java | 226 ++-- .../FromJsclSimplifyTextProcessorTest.java | 4 +- .../history/CalculatorHistoryImplTest.java | 58 +- .../FromJsclNumericTextProcessorTest.java | 18 +- .../android/calculator/math/MathTypeTest.java | 2 +- .../model/AndroidCalculatorEngineTest.java | 184 ++-- .../calculator/model/FunctionsTest.java | 218 ++-- .../calculator/model/NumeralBaseTest.java | 2 +- .../model/ToJsclTextProcessorTest.java | 88 +- pom.xml | 542 +++++----- 523 files changed, 20785 insertions(+), 19727 deletions(-) diff --git a/android-app-core/AndroidManifest.xml b/android-app-core/AndroidManifest.xml index 312325db..cfe0783d 100644 --- a/android-app-core/AndroidManifest.xml +++ b/android-app-core/AndroidManifest.xml @@ -1,6 +1,5 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/android-app-core/pom.xml b/android-app-core/pom.xml index 0d45fb72..300fa660 100644 --- a/android-app-core/pom.xml +++ b/android-app-core/pom.xml @@ -1,16 +1,16 @@ - 4.0.0 + 4.0.0 - - org.solovyev.android - calculatorpp-parent - 1.6.3-SNAPSHOT - + + org.solovyev.android + calculatorpp-parent + 1.6.3-SNAPSHOT + - org.solovyev.android - calculatorpp-android-app-core - 1.6.3-SNAPSHOT + org.solovyev.android + calculatorpp-android-app-core + 1.6.3-SNAPSHOT Calculator++ Application Core apklib @@ -21,43 +21,43 @@ calculatorpp-core - - org.solovyev - common-core - + + org.solovyev + common-core + - - org.solovyev - common-text - + + org.solovyev + common-text + - - org.solovyev.android - android-common-all - apklib - + + org.solovyev.android + android-common-all + apklib + - - org.solovyev - jscl - + + org.solovyev + jscl + - - com.actionbarsherlock - library - apklib - + + com.actionbarsherlock + library + apklib + - - com.google.android - android - provided - + + com.google.android + android + provided + - - com.google.android - support-v4 - + + com.google.android + support-v4 + @@ -71,5 +71,5 @@ - + \ No newline at end of file diff --git a/android-app-core/res/drawable/blue_button.xml b/android-app-core/res/drawable/blue_button.xml index dc5f61c0..3f190da7 100644 --- a/android-app-core/res/drawable/blue_button.xml +++ b/android-app-core/res/drawable/blue_button.xml @@ -2,9 +2,8 @@ - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/blue_button_dark.xml b/android-app-core/res/drawable/blue_button_dark.xml index 39fd8f86..38247e80 100644 --- a/android-app-core/res/drawable/blue_button_dark.xml +++ b/android-app-core/res/drawable/blue_button_dark.xml @@ -2,9 +2,8 @@ - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/blue_button_dark_shape.xml b/android-app-core/res/drawable/blue_button_dark_shape.xml index a2bde68b..153639d6 100644 --- a/android-app-core/res/drawable/blue_button_dark_shape.xml +++ b/android-app-core/res/drawable/blue_button_dark_shape.xml @@ -7,8 +7,9 @@ --> - - + + diff --git a/android-app-core/res/drawable/blue_button_shape.xml b/android-app-core/res/drawable/blue_button_shape.xml index 4e0ef759..fd8acd78 100644 --- a/android-app-core/res/drawable/blue_button_shape.xml +++ b/android-app-core/res/drawable/blue_button_shape.xml @@ -1,8 +1,9 @@ - - + + diff --git a/android-app-core/res/drawable/default_abs__btn_cab_done_holo_dark.xml b/android-app-core/res/drawable/default_abs__btn_cab_done_holo_dark.xml index 89f81b08..c029d95c 100644 --- a/android-app-core/res/drawable/default_abs__btn_cab_done_holo_dark.xml +++ b/android-app-core/res/drawable/default_abs__btn_cab_done_holo_dark.xml @@ -1,5 +1,4 @@ - - - - - + + + diff --git a/android-app-core/res/drawable/default_abs__item_background_holo_dark.xml b/android-app-core/res/drawable/default_abs__item_background_holo_dark.xml index 972d516c..eb72d05b 100644 --- a/android-app-core/res/drawable/default_abs__item_background_holo_dark.xml +++ b/android-app-core/res/drawable/default_abs__item_background_holo_dark.xml @@ -1,5 +1,4 @@ - - - - - - - - + + + + + + + diff --git a/android-app-core/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml b/android-app-core/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml index fc72f082..c9f87b73 100644 --- a/android-app-core/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml +++ b/android-app-core/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml @@ -1,5 +1,4 @@ - - - - + + diff --git a/android-app-core/res/drawable/default_abs__list_selector_holo_dark.xml b/android-app-core/res/drawable/default_abs__list_selector_holo_dark.xml index d21ac8b3..619ff9d3 100644 --- a/android-app-core/res/drawable/default_abs__list_selector_holo_dark.xml +++ b/android-app-core/res/drawable/default_abs__list_selector_holo_dark.xml @@ -1,5 +1,4 @@ - - - - - - - + + + + + + diff --git a/android-app-core/res/drawable/default_abs__spinner_ab_holo_dark.xml b/android-app-core/res/drawable/default_abs__spinner_ab_holo_dark.xml index 8b818f24..4cda1e26 100644 --- a/android-app-core/res/drawable/default_abs__spinner_ab_holo_dark.xml +++ b/android-app-core/res/drawable/default_abs__spinner_ab_holo_dark.xml @@ -1,5 +1,4 @@ - - - - - - + + + + diff --git a/android-app-core/res/drawable/default_abs__tab_indicator_ab_holo.xml b/android-app-core/res/drawable/default_abs__tab_indicator_ab_holo.xml index 262e94c9..e538a5f4 100644 --- a/android-app-core/res/drawable/default_abs__tab_indicator_ab_holo.xml +++ b/android-app-core/res/drawable/default_abs__tab_indicator_ab_holo.xml @@ -1,5 +1,4 @@ - - - - - + + + - - - + + + - - - - + + + + - - - + + + diff --git a/android-app-core/res/drawable/gray_button.xml b/android-app-core/res/drawable/gray_button.xml index 0475d651..967fbfc0 100644 --- a/android-app-core/res/drawable/gray_button.xml +++ b/android-app-core/res/drawable/gray_button.xml @@ -2,9 +2,8 @@ - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/gray_button_dark.xml b/android-app-core/res/drawable/gray_button_dark.xml index 8005ad57..4c45b348 100644 --- a/android-app-core/res/drawable/gray_button_dark.xml +++ b/android-app-core/res/drawable/gray_button_dark.xml @@ -2,9 +2,8 @@ - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/gray_button_dark_shape.xml b/android-app-core/res/drawable/gray_button_dark_shape.xml index 62262512..6545aa5a 100644 --- a/android-app-core/res/drawable/gray_button_dark_shape.xml +++ b/android-app-core/res/drawable/gray_button_dark_shape.xml @@ -1,8 +1,9 @@ - - + + diff --git a/android-app-core/res/drawable/gray_button_shape.xml b/android-app-core/res/drawable/gray_button_shape.xml index 840e90f4..1710094b 100644 --- a/android-app-core/res/drawable/gray_button_shape.xml +++ b/android-app-core/res/drawable/gray_button_shape.xml @@ -1,8 +1,9 @@ - - + + diff --git a/android-app-core/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml b/android-app-core/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml index 1f468ac7..75077a99 100644 --- a/android-app-core/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml +++ b/android-app-core/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml @@ -1,5 +1,4 @@ - - - - - + + + - - - + + + - - - - + + + + - - - + + + diff --git a/android-app-core/res/drawable/metro_blue_button.xml b/android-app-core/res/drawable/metro_blue_button.xml index 24368529..a638c635 100644 --- a/android-app-core/res/drawable/metro_blue_button.xml +++ b/android-app-core/res/drawable/metro_blue_button.xml @@ -2,9 +2,8 @@ - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_blue_button_shape.xml b/android-app-core/res/drawable/metro_blue_button_shape.xml index 656da4fb..e6fc3fc1 100644 --- a/android-app-core/res/drawable/metro_blue_button_shape.xml +++ b/android-app-core/res/drawable/metro_blue_button_shape.xml @@ -1,5 +1,4 @@ - - - - + + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_blue_list_item.xml b/android-app-core/res/drawable/metro_blue_list_item.xml index 2180338c..21559be3 100644 --- a/android-app-core/res/drawable/metro_blue_list_item.xml +++ b/android-app-core/res/drawable/metro_blue_list_item.xml @@ -2,20 +2,20 @@ - - - + + + - - - + + + - - - - + + + + - - - + + + diff --git a/android-app-core/res/drawable/metro_button_dark.xml b/android-app-core/res/drawable/metro_button_dark.xml index 5e752adf..01eecc9c 100644 --- a/android-app-core/res/drawable/metro_button_dark.xml +++ b/android-app-core/res/drawable/metro_button_dark.xml @@ -2,8 +2,7 @@ - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_button_dark_shape.xml b/android-app-core/res/drawable/metro_button_dark_shape.xml index 65f7f671..3f06ca5b 100644 --- a/android-app-core/res/drawable/metro_button_dark_shape.xml +++ b/android-app-core/res/drawable/metro_button_dark_shape.xml @@ -1,5 +1,4 @@ - - - - + + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_button_green.xml b/android-app-core/res/drawable/metro_button_green.xml index ac3da7d1..4fa1e269 100644 --- a/android-app-core/res/drawable/metro_button_green.xml +++ b/android-app-core/res/drawable/metro_button_green.xml @@ -2,9 +2,8 @@ - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_button_green_shape.xml b/android-app-core/res/drawable/metro_button_green_shape.xml index 247e25e9..01833fac 100644 --- a/android-app-core/res/drawable/metro_button_green_shape.xml +++ b/android-app-core/res/drawable/metro_button_green_shape.xml @@ -1,5 +1,4 @@ - - - - + + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_button_light.xml b/android-app-core/res/drawable/metro_button_light.xml index 30394010..1498b5aa 100644 --- a/android-app-core/res/drawable/metro_button_light.xml +++ b/android-app-core/res/drawable/metro_button_light.xml @@ -2,8 +2,7 @@ - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_button_light_shape.xml b/android-app-core/res/drawable/metro_button_light_shape.xml index 2de2e09f..32bbaf5c 100644 --- a/android-app-core/res/drawable/metro_button_light_shape.xml +++ b/android-app-core/res/drawable/metro_button_light_shape.xml @@ -1,5 +1,4 @@ - - - - + + diff --git a/android-app-core/res/drawable/metro_button_pressed.xml b/android-app-core/res/drawable/metro_button_pressed.xml index e6d88e63..386a4bad 100644 --- a/android-app-core/res/drawable/metro_button_pressed.xml +++ b/android-app-core/res/drawable/metro_button_pressed.xml @@ -1,5 +1,4 @@ - - - - + + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_button_purple.xml b/android-app-core/res/drawable/metro_button_purple.xml index beb401f7..d5c51b1e 100644 --- a/android-app-core/res/drawable/metro_button_purple.xml +++ b/android-app-core/res/drawable/metro_button_purple.xml @@ -2,9 +2,8 @@ - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_button_purple_shape.xml b/android-app-core/res/drawable/metro_button_purple_shape.xml index 343112fc..e50eab0f 100644 --- a/android-app-core/res/drawable/metro_button_purple_shape.xml +++ b/android-app-core/res/drawable/metro_button_purple_shape.xml @@ -1,5 +1,4 @@ - - - - + + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_green_list_item.xml b/android-app-core/res/drawable/metro_green_list_item.xml index a46d60e8..e7292aa6 100644 --- a/android-app-core/res/drawable/metro_green_list_item.xml +++ b/android-app-core/res/drawable/metro_green_list_item.xml @@ -2,21 +2,21 @@ - - - + + + - - - + + + - - - - + + + + - - - + + + diff --git a/android-app-core/res/drawable/metro_purple_list_item.xml b/android-app-core/res/drawable/metro_purple_list_item.xml index d966445e..34bbe728 100644 --- a/android-app-core/res/drawable/metro_purple_list_item.xml +++ b/android-app-core/res/drawable/metro_purple_list_item.xml @@ -2,20 +2,20 @@ - - - + + + - - - + + + - - - - + + + + - - - + + + diff --git a/android-app-core/res/drawable/pane_background.xml b/android-app-core/res/drawable/pane_background.xml index 763272f3..4058c468 100644 --- a/android-app-core/res/drawable/pane_background.xml +++ b/android-app-core/res/drawable/pane_background.xml @@ -1,5 +1,4 @@ - - - - + + \ No newline at end of file diff --git a/android-app-core/res/drawable/violet_button.xml b/android-app-core/res/drawable/violet_button.xml index f1f10580..2f72752a 100644 --- a/android-app-core/res/drawable/violet_button.xml +++ b/android-app-core/res/drawable/violet_button.xml @@ -2,9 +2,8 @@ - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/violet_button_dark.xml b/android-app-core/res/drawable/violet_button_dark.xml index b1b755df..2d1232c8 100644 --- a/android-app-core/res/drawable/violet_button_dark.xml +++ b/android-app-core/res/drawable/violet_button_dark.xml @@ -2,9 +2,8 @@ - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/violet_button_dark_shape.xml b/android-app-core/res/drawable/violet_button_dark_shape.xml index b8553175..7409fe9c 100644 --- a/android-app-core/res/drawable/violet_button_dark_shape.xml +++ b/android-app-core/res/drawable/violet_button_dark_shape.xml @@ -7,8 +7,9 @@ --> - - + + diff --git a/android-app-core/res/drawable/violet_button_shape.xml b/android-app-core/res/drawable/violet_button_shape.xml index b5133366..4ef0e931 100644 --- a/android-app-core/res/drawable/violet_button_shape.xml +++ b/android-app-core/res/drawable/violet_button_shape.xml @@ -7,8 +7,9 @@ --> - - + + diff --git a/android-app-core/res/layout/cpp_fixable_messages_dialog.xml b/android-app-core/res/layout/cpp_fixable_messages_dialog.xml index 43a71fff..333c2c04 100644 --- a/android-app-core/res/layout/cpp_fixable_messages_dialog.xml +++ b/android-app-core/res/layout/cpp_fixable_messages_dialog.xml @@ -1,31 +1,32 @@ + style="?cpp_dialog_style"> - + - + - + -