TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

external listeners removed

Browse Source
This commit is contained in:
Sergey Solovyev
2013-06-28 00:53:12 +04:00
parent 8d15db4c3f
commit 6ab63bfbbc
13 changed files with 23 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/solovyev/android/calculator/CalculatorLocator.java
View File

@@ -22,7 +22,6 @@
package org.solovyev.android.calculator;
import org.solovyev.android.calculator.external.CalculatorExternalListenersContainer;
import org.solovyev.android.calculator.history.CalculatorHistory;
import org.solovyev.android.calculator.plot.CalculatorPlotter;
import org.solovyev.android.calculator.text.TextProcessor;
@@ -46,7 +45,6 @@ public interface CalculatorLocator {
@Nonnull CalculatorLogger logger,
@Nonnull CalculatorPreferenceService preferenceService,
@Nonnull CalculatorKeyboard keyboard,
@Nonnull CalculatorExternalListenersContainer externalListenersContainer,
@Nonnull CalculatorPlotter plotter,
@Nullable TextProcessor<TextProcessorEditorResult, String> editorTextProcessor);
@@ -82,8 +80,4 @@ public interface CalculatorLocator {
@Nonnull
CalculatorPreferenceService getPreferenceService();
// for robolectric
/*@Nonnull*/
CalculatorExternalListenersContainer getExternalListenersContainer();
}

12
core/src/main/java/org/solovyev/android/calculator/Locator.java
View File

@@ -22,7 +22,6 @@
package org.solovyev.android.calculator;
import org.solovyev.android.calculator.external.CalculatorExternalListenersContainer;
import org.solovyev.android.calculator.history.CalculatorHistory;
import org.solovyev.android.calculator.plot.CalculatorPlotter;
import org.solovyev.android.calculator.text.TextProcessor;
@@ -71,9 +70,6 @@ public class Locator implements CalculatorLocator {
@Nonnull
private CalculatorPreferenceService calculatorPreferenceService;
/*@Nonnull*/
private CalculatorExternalListenersContainer calculatorExternalListenersContainer;
@Nonnull
private CalculatorPlotter calculatorPlotter;
@@ -89,7 +85,6 @@ public class Locator implements CalculatorLocator {
@Nonnull CalculatorLogger logger,
@Nonnull CalculatorPreferenceService preferenceService,
@Nonnull CalculatorKeyboard keyboard,
@Nonnull CalculatorExternalListenersContainer externalListenersContainer,
@Nonnull CalculatorPlotter plotter,
@Nullable TextProcessor<TextProcessorEditorResult, String> editorTextProcessor) {
@@ -100,7 +95,6 @@ public class Locator implements CalculatorLocator {
this.calculatorHistory = history;
this.calculatorLogger = logger;
this.calculatorPreferenceService = preferenceService;
this.calculatorExternalListenersContainer = externalListenersContainer;
this.calculatorPlotter = plotter;
calculatorEditor = new CalculatorEditorImpl(this.calculator, editorTextProcessor);
@@ -178,10 +172,4 @@ public class Locator implements CalculatorLocator {
public CalculatorPreferenceService getPreferenceService() {
return this.calculatorPreferenceService;
}
@Override
/*@Nonnull*/
public CalculatorExternalListenersContainer getExternalListenersContainer() {
return calculatorExternalListenersContainer;
}
}

32
core/src/main/java/org/solovyev/android/calculator/external/CalculatorExternalListenersContainer.java vendored
View File

@@ -1,32 +0,0 @@
/*
* Copyright 2013 serso aka se.solovyev
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Contact details
*
* Email: se.solovyev@gmail.com
* Site: http://se.solovyev.org
*/
package org.solovyev.android.calculator.external;
import javax.annotation.Nonnull;
public interface CalculatorExternalListenersContainer {
void addExternalListener(@Nonnull Class<?> externalCalculatorClass);
boolean removeExternalListener(@Nonnull Class<?> externalCalculatorClass);
}