Reformated code and moved Plugboard, EntryWheel, Reflector, Rotor to new package parts
This commit is contained in:
VanitasVitae
parent
dbfb1d5d79
commit
c938b745bc
|
|
@ -10,28 +10,29 @@ import android.util.Log;
|
|||
* Class that represents the settings activity.
|
||||
* Use the singleton to get an instance of this class to get preferences
|
||||
* Copyright (C) 2015 Paul Schaub
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*@author vanitasvitae
|
||||
* <p>
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
* <p>
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
* <p>
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* @author vanitasvitae
|
||||
*/
|
||||
public class SettingsActivity extends PreferenceActivity
|
||||
{
|
||||
public static final String PREF_NUMERIC_LANGUAGE = "prefNumericLanguage";
|
||||
public static final String PREF_MACHINE_TYPE = "prefMachineType";
|
||||
public static final String PREF_MESSAGE_FORMATTING = "prefMessageFormatting";
|
||||
public static final String PREF_REPLACE_SPECIAL_CHARACTERS = "prefReplaceSpecialCharacters";
|
||||
public static final String PREF_NUMERIC_LANGUAGE = "prefNumericLanguage";
|
||||
public static final String PREF_MACHINE_TYPE = "prefMachineType";
|
||||
public static final String PREF_MESSAGE_FORMATTING = "prefMessageFormatting";
|
||||
public static final String PREF_REPLACE_SPECIAL_CHARACTERS = "prefReplaceSpecialCharacters";
|
||||
public static final String PREF_SAVED_ENIGMA_STATE = "prefSavedEnigmaState";
|
||||
public static final String PREF_VERSION_NUMBER = "prefVersionNumber";
|
||||
|
||||
|
|
@ -44,13 +45,13 @@ public class SettingsActivity extends PreferenceActivity
|
|||
SharedPreferences prefs;
|
||||
Resources res;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState)
|
||||
{
|
||||
super.onCreate(savedInstanceState);
|
||||
//noinspection deprecation
|
||||
addPreferencesFromResource(R.xml.pref_page);
|
||||
}
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState)
|
||||
{
|
||||
super.onCreate(savedInstanceState);
|
||||
//noinspection deprecation
|
||||
addPreferencesFromResource(R.xml.pref_page);
|
||||
}
|
||||
|
||||
public void setSharedPreferences(SharedPreferences prefs)
|
||||
{
|
||||
|
|
@ -64,12 +65,13 @@ public class SettingsActivity extends PreferenceActivity
|
|||
|
||||
private boolean isFullyInitilaized()
|
||||
{
|
||||
if(prefs == null)
|
||||
if (prefs == null)
|
||||
{
|
||||
Log.e(MainActivity.APP_ID, "SharedPreferences not initialized via setSharedPreferences!");
|
||||
Log.e(MainActivity.APP_ID,
|
||||
"SharedPreferences not initialized via setSharedPreferences!");
|
||||
return false;
|
||||
}
|
||||
if(res == null)
|
||||
if (res == null)
|
||||
{
|
||||
Log.e(MainActivity.APP_ID, "Resources not initialized via setResources!");
|
||||
return false;
|
||||
|
|
@ -79,25 +81,26 @@ public class SettingsActivity extends PreferenceActivity
|
|||
|
||||
public String getPrefNumericLanguage()
|
||||
{
|
||||
if(isFullyInitilaized())
|
||||
if (isFullyInitilaized())
|
||||
return prefs.getString(
|
||||
PREF_NUMERIC_LANGUAGE,
|
||||
res.getStringArray(R.array.pref_alias_message_formatting)[0]);
|
||||
PREF_NUMERIC_LANGUAGE,
|
||||
res.getStringArray(R.array.pref_alias_message_formatting)[0]);
|
||||
else return null;
|
||||
}
|
||||
|
||||
public void setPrefNumericLanguage(String lang)
|
||||
{
|
||||
if(isFullyInitilaized())
|
||||
if (isFullyInitilaized())
|
||||
prefs.edit().putString(PREF_NUMERIC_LANGUAGE, lang).apply();
|
||||
}
|
||||
|
||||
public boolean prefNumericLanguageChanged()
|
||||
{
|
||||
if(this.previousPrefNumericLanguage == null || !this.previousPrefNumericLanguage.equals(getPrefNumericLanguage()))
|
||||
if (this.previousPrefNumericLanguage == null || !this.previousPrefNumericLanguage.equals(
|
||||
getPrefNumericLanguage()))
|
||||
{
|
||||
this.previousPrefNumericLanguage = this.getPrefNumericLanguage();
|
||||
Log.d(MainActivity.APP_ID, PREF_NUMERIC_LANGUAGE +" changed!");
|
||||
Log.d(MainActivity.APP_ID, PREF_NUMERIC_LANGUAGE+" changed!");
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
@ -105,49 +108,50 @@ public class SettingsActivity extends PreferenceActivity
|
|||
|
||||
public boolean getPrefReplaceSpecialCharacters()
|
||||
{
|
||||
if(isFullyInitilaized())
|
||||
if (isFullyInitilaized())
|
||||
return prefs.getBoolean(PREF_REPLACE_SPECIAL_CHARACTERS, true);
|
||||
else return false;
|
||||
}
|
||||
|
||||
public void setPrefReplaceSpecialCharacters(boolean replace)
|
||||
{
|
||||
if(isFullyInitilaized())
|
||||
if (isFullyInitilaized())
|
||||
prefs.edit().putBoolean(PREF_REPLACE_SPECIAL_CHARACTERS, replace).apply();
|
||||
}
|
||||
|
||||
public boolean prefReplaceSpecialCharactersChanged()
|
||||
{
|
||||
boolean changed = previousPrefReplaceSpecialCharacters != getPrefReplaceSpecialCharacters();
|
||||
if(changed)
|
||||
if (changed)
|
||||
{
|
||||
previousPrefReplaceSpecialCharacters = getPrefReplaceSpecialCharacters();
|
||||
Log.d(MainActivity.APP_ID, PREF_REPLACE_SPECIAL_CHARACTERS +" changed!");
|
||||
Log.d(MainActivity.APP_ID, PREF_REPLACE_SPECIAL_CHARACTERS+" changed!");
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public String getPrefMachineType()
|
||||
{
|
||||
if(isFullyInitilaized())
|
||||
return prefs.getString(PREF_MACHINE_TYPE,
|
||||
public String getPrefMachineType()
|
||||
{
|
||||
if (isFullyInitilaized())
|
||||
return prefs.getString(PREF_MACHINE_TYPE,
|
||||
res.getStringArray(R.array.pref_alias_machine_type)[0]);
|
||||
else return null;
|
||||
}
|
||||
}
|
||||
|
||||
public void setPrefMachineType(String pref)
|
||||
{
|
||||
if(isFullyInitilaized())
|
||||
if (isFullyInitilaized())
|
||||
prefs.edit().putString(PREF_MACHINE_TYPE, pref).apply();
|
||||
}
|
||||
|
||||
public boolean prefMachineTypeChanged()
|
||||
{
|
||||
if(this.previousPrefMachineType == null || !this.previousPrefMachineType.equals(getPrefMachineType()))
|
||||
if (this.previousPrefMachineType == null || !this.previousPrefMachineType.equals(
|
||||
getPrefMachineType()))
|
||||
{
|
||||
this.previousPrefMachineType = this.getPrefMachineType();
|
||||
Log.d(MainActivity.APP_ID, PREF_MACHINE_TYPE +" changed!");
|
||||
Log.d(MainActivity.APP_ID, PREF_MACHINE_TYPE+" changed!");
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
@ -155,7 +159,7 @@ public class SettingsActivity extends PreferenceActivity
|
|||
|
||||
public String getPrefSavedEnigmaState()
|
||||
{
|
||||
if(isFullyInitilaized())
|
||||
if (isFullyInitilaized())
|
||||
return prefs.getString(PREF_SAVED_ENIGMA_STATE, "-1");
|
||||
else return null;
|
||||
}
|
||||
|
|
@ -165,17 +169,17 @@ public class SettingsActivity extends PreferenceActivity
|
|||
*/
|
||||
public void setPrefSavedEnigmaState(String state)
|
||||
{
|
||||
if(isFullyInitilaized())
|
||||
if (isFullyInitilaized())
|
||||
prefs.edit().putString(PREF_SAVED_ENIGMA_STATE, state).apply();
|
||||
}
|
||||
|
||||
public boolean prefSavedEnigmaStateChanged()
|
||||
{
|
||||
if(this.previousPrefSavedEnigmaState == null || !this.previousPrefSavedEnigmaState
|
||||
if (this.previousPrefSavedEnigmaState == null || !this.previousPrefSavedEnigmaState
|
||||
.equals(getPrefSavedEnigmaState()))
|
||||
{
|
||||
this.previousPrefSavedEnigmaState = this.getPrefSavedEnigmaState();
|
||||
Log.d(MainActivity.APP_ID, PREF_SAVED_ENIGMA_STATE +" changed!");
|
||||
Log.d(MainActivity.APP_ID, PREF_SAVED_ENIGMA_STATE+" changed!");
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
@ -183,7 +187,7 @@ public class SettingsActivity extends PreferenceActivity
|
|||
|
||||
public String getPrefMessageFormatting()
|
||||
{
|
||||
if(isFullyInitilaized())
|
||||
if (isFullyInitilaized())
|
||||
return prefs.getString(SettingsActivity.PREF_MESSAGE_FORMATTING,
|
||||
res.getStringArray(R.array.pref_alias_message_formatting)[0]);
|
||||
else return null;
|
||||
|
|
@ -191,17 +195,17 @@ public class SettingsActivity extends PreferenceActivity
|
|||
|
||||
public void setPrefMessageFormatting(String format)
|
||||
{
|
||||
if(isFullyInitilaized())
|
||||
if (isFullyInitilaized())
|
||||
prefs.edit().putString(PREF_MESSAGE_FORMATTING, format).apply();
|
||||
}
|
||||
|
||||
public boolean prefMessageFormattingChanged()
|
||||
{
|
||||
if(this.previousPrefMessageFormatting == null || !this.previousPrefMessageFormatting
|
||||
if (this.previousPrefMessageFormatting == null || !this.previousPrefMessageFormatting
|
||||
.equals(getPrefMessageFormatting()))
|
||||
{
|
||||
this.previousPrefMessageFormatting = this.getPrefMessageFormatting();
|
||||
Log.d(MainActivity.APP_ID, PREF_MESSAGE_FORMATTING +" changed!");
|
||||
Log.d(MainActivity.APP_ID, PREF_MESSAGE_FORMATTING+" changed!");
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
@ -209,20 +213,21 @@ public class SettingsActivity extends PreferenceActivity
|
|||
|
||||
public int getVersionNumber()
|
||||
{
|
||||
if(isFullyInitilaized())
|
||||
if (isFullyInitilaized())
|
||||
return prefs.getInt(PREF_VERSION_NUMBER, -1);
|
||||
else return -1;
|
||||
}
|
||||
|
||||
public void setVersionNumber(int v)
|
||||
{
|
||||
if(isFullyInitilaized())
|
||||
if (isFullyInitilaized())
|
||||
prefs.edit().putInt(PREF_VERSION_NUMBER, v).apply();
|
||||
}
|
||||
|
||||
public static class SettingsSingleton extends SettingsActivity
|
||||
{
|
||||
private static SettingsActivity instance;
|
||||
|
||||
private SettingsSingleton()
|
||||
{
|
||||
super();
|
||||
|
|
@ -238,7 +243,7 @@ public class SettingsActivity extends PreferenceActivity
|
|||
|
||||
public static SettingsActivity getInstance()
|
||||
{
|
||||
if(instance == null)
|
||||
if (instance == null)
|
||||
{
|
||||
instance = new SettingsActivity();
|
||||
Log.d(MainActivity.APP_ID, "Created new SettingsActivity!");
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@ import java.util.ArrayList;
|
|||
import java.util.Random;
|
||||
|
||||
import de.vanitasvitae.enigmandroid.MainActivity;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Rotor;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Rotor;
|
||||
|
||||
/**
|
||||
* Main component of the Enigma machine
|
||||
|
|
|
|||
|
|
@ -5,9 +5,10 @@ import android.util.Log;
|
|||
import java.math.BigInteger;
|
||||
|
||||
import de.vanitasvitae.enigmandroid.MainActivity;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Rotor;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Plugboard;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Rotor;
|
||||
|
||||
/**
|
||||
* Concrete implementation of an enigma machine of name D
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@ import android.util.Log;
|
|||
import java.math.BigInteger;
|
||||
|
||||
import de.vanitasvitae.enigmandroid.MainActivity;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Rotor;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Rotor;
|
||||
|
||||
/**
|
||||
* Implementation of the Enigma machine of name G31 (Abwehr)
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@ import android.util.Log;
|
|||
import java.math.BigInteger;
|
||||
|
||||
import de.vanitasvitae.enigmandroid.MainActivity;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Rotor;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Rotor;
|
||||
|
||||
/**
|
||||
* Implementation of the Enigma machine of name G31 (Abwehr)
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@ import android.util.Log;
|
|||
import java.math.BigInteger;
|
||||
|
||||
import de.vanitasvitae.enigmandroid.MainActivity;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Rotor;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Rotor;
|
||||
|
||||
/**
|
||||
* Implementation of the Enigma machine of name G31 (Abwehr)
|
||||
|
|
|
|||
|
|
@ -5,9 +5,10 @@ import android.util.Log;
|
|||
import java.math.BigInteger;
|
||||
|
||||
import de.vanitasvitae.enigmandroid.MainActivity;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Rotor;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Plugboard;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Rotor;
|
||||
|
||||
/**
|
||||
* Concrete implementation of an enigma machine of name I
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@ import android.util.Log;
|
|||
import java.math.BigInteger;
|
||||
|
||||
import de.vanitasvitae.enigmandroid.MainActivity;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Rotor;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Rotor;
|
||||
|
||||
/**
|
||||
* Implementation of the Enigma machine of name K
|
||||
|
|
|
|||
|
|
@ -5,9 +5,10 @@ import android.util.Log;
|
|||
import java.math.BigInteger;
|
||||
|
||||
import de.vanitasvitae.enigmandroid.MainActivity;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Rotor;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Plugboard;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Rotor;
|
||||
|
||||
/**
|
||||
* Concrete implementation of an enigma machine of name D
|
||||
|
|
@ -47,7 +48,7 @@ public class Enigma_KD extends Enigma {
|
|||
@Override
|
||||
protected void establishAvailableParts()
|
||||
{
|
||||
addAvailableEntryWheel(new EntryWheel.EntryWheel_QWERTZ()); //TODO: Really?
|
||||
addAvailableEntryWheel(new EntryWheel.EntryWheel_QWERTZ());
|
||||
|
||||
addAvailableRotor(new Rotor.Rotor_KD_I(0, 0));
|
||||
addAvailableRotor(new Rotor.Rotor_KD_II(0, 0));
|
||||
|
|
@ -232,7 +233,7 @@ public class Enigma_KD extends Enigma {
|
|||
s = addDigit(s, rotor2.getIndex(), availableRotors.size());
|
||||
s = addDigit(s, rotor1.getIndex(), availableRotors.size());
|
||||
|
||||
s = addDigit(s, 12, 20); //Machine #12 TODO: Reorder?
|
||||
s = addDigit(s, 12, 20); //Machine #12
|
||||
s = addDigit(s, protocol_version, MainActivity.max_protocol_version);
|
||||
|
||||
return s;
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@ import android.util.Log;
|
|||
import java.math.BigInteger;
|
||||
|
||||
import de.vanitasvitae.enigmandroid.MainActivity;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Rotor;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Rotor;
|
||||
|
||||
/**
|
||||
* Implementation of the Enigma machine of name K (Switzerland, Airforce)
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@ import android.util.Log;
|
|||
import java.math.BigInteger;
|
||||
|
||||
import de.vanitasvitae.enigmandroid.MainActivity;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Rotor;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Rotor;
|
||||
|
||||
/**
|
||||
* Implementation of the Enigma machine of name K (Switzerland)
|
||||
|
|
|
|||
|
|
@ -5,9 +5,10 @@ import android.util.Log;
|
|||
import java.math.BigInteger;
|
||||
|
||||
import de.vanitasvitae.enigmandroid.MainActivity;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Rotor;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Plugboard;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Rotor;
|
||||
|
||||
/**
|
||||
* Concrete implementation of an enigma machine model M3
|
||||
|
|
|
|||
|
|
@ -6,9 +6,10 @@ import java.math.BigInteger;
|
|||
import java.util.ArrayList;
|
||||
|
||||
import de.vanitasvitae.enigmandroid.MainActivity;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Rotor;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Plugboard;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Rotor;
|
||||
|
||||
/**
|
||||
* Concrete Implementation of the Enigma Machine name M4 of the german Kriegsmarine
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@ import android.util.Log;
|
|||
import java.math.BigInteger;
|
||||
|
||||
import de.vanitasvitae.enigmandroid.MainActivity;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Rotor;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Rotor;
|
||||
|
||||
/**
|
||||
* Implementation of the Enigma machine of name R ("Rocket", Reichsbahn)
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@ import android.util.Log;
|
|||
import java.math.BigInteger;
|
||||
|
||||
import de.vanitasvitae.enigmandroid.MainActivity;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.rotors.Rotor;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.EntryWheel;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Reflector;
|
||||
import de.vanitasvitae.enigmandroid.enigma.parts.Rotor;
|
||||
|
||||
/**
|
||||
* Implementation of the Enigma machine of name T Tirpitz
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package de.vanitasvitae.enigmandroid.enigma.rotors;
|
||||
package de.vanitasvitae.enigmandroid.enigma.parts;
|
||||
|
||||
/**
|
||||
* Implementation of several EntryWheels
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.vanitasvitae.enigmandroid.enigma;
|
||||
package de.vanitasvitae.enigmandroid.enigma.parts;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
|
|
@ -7,6 +7,7 @@ import java.util.Arrays;
|
|||
import java.util.Random;
|
||||
|
||||
import de.vanitasvitae.enigmandroid.MainActivity;
|
||||
import de.vanitasvitae.enigmandroid.enigma.Enigma;
|
||||
import de.vanitasvitae.enigmandroid.enigma.inputPreparer.InputPreparer;
|
||||
|
||||
/**
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.vanitasvitae.enigmandroid.enigma.rotors;
|
||||
package de.vanitasvitae.enigmandroid.enigma.parts;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
|
|
@ -7,7 +7,6 @@ import java.util.Arrays;
|
|||
|
||||
import de.vanitasvitae.enigmandroid.MainActivity;
|
||||
import de.vanitasvitae.enigmandroid.enigma.Enigma;
|
||||
import de.vanitasvitae.enigmandroid.enigma.Plugboard;
|
||||
|
||||
/**
|
||||
* Reflector of the enigma machine.
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.vanitasvitae.enigmandroid.enigma.rotors;
|
||||
package de.vanitasvitae.enigmandroid.enigma.parts;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
|
|
@ -188,5 +188,4 @@ public abstract class LayoutContainer
|
|||
{
|
||||
//TODO
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue