Implement base connection to PrograMaker API.
- Login and check of the login token.
This commit is contained in:
Sergio Martínez Portela
parent
1cdc679c70
commit
033b79cba1
27 changed files with 214 additions and 61 deletions
|
|
@ -17,8 +17,8 @@ import com.codigoparallevar.minicards.types.PartConnection;
|
|||
import com.codigoparallevar.minicards.types.PartGrid;
|
||||
import com.codigoparallevar.minicards.types.Position;
|
||||
import com.codigoparallevar.minicards.types.Selectable;
|
||||
import com.codigoparallevar.minicards.types.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.Tuple4;
|
||||
import com.codigoparallevar.minicards.types.functional.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.functional.Tuple4;
|
||||
import com.codigoparallevar.minicards.types.connectors.input.AnyInputConnector;
|
||||
import com.codigoparallevar.minicards.types.connectors.input.BooleanInputConnector;
|
||||
import com.codigoparallevar.minicards.types.connectors.input.InputConnector;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ import com.codigoparallevar.minicards.parts.strings.ConvertToString;
|
|||
import com.codigoparallevar.minicards.types.Part;
|
||||
import com.codigoparallevar.minicards.types.PartConnection;
|
||||
import com.codigoparallevar.minicards.types.PartGrid;
|
||||
import com.codigoparallevar.minicards.types.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.functional.Tuple2;
|
||||
|
||||
import org.json.JSONArray;
|
||||
import org.json.JSONException;
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ class CardPreviewArrayAdapter extends ArrayAdapter<PreviewCard> {
|
|||
}
|
||||
});
|
||||
|
||||
final ImageView settingsButton = (ImageView) row.findViewById(R.id.card_preview_settings_button);
|
||||
final ImageView settingsButton = row.findViewById(R.id.card_preview_settings_button);
|
||||
settingsButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
|
|
@ -58,19 +58,10 @@ class CardPreviewArrayAdapter extends ArrayAdapter<PreviewCard> {
|
|||
}
|
||||
});
|
||||
|
||||
CardView cardView = (CardView) row.findViewById(R.id.card_preview_card);
|
||||
TextView nameView = (TextView) row.findViewById(R.id.card_preview_name);
|
||||
CardView cardView = row.findViewById(R.id.card_preview_card);
|
||||
TextView nameView = row.findViewById(R.id.card_preview_name);
|
||||
|
||||
int backgroundColor = card.getColor();
|
||||
cardView.setBackgroundColor(backgroundColor);
|
||||
nameView.setText(card.getName());
|
||||
if (backgroundColor == CardFile.DEFAULT_BACKGROUND_COLOR){
|
||||
nameView.setTextColor(0xFFF0F0F0);
|
||||
}
|
||||
else {
|
||||
nameView.setTextColor(0xFFFFFF ^ backgroundColor);
|
||||
}
|
||||
|
||||
return row;
|
||||
}
|
||||
|
||||
|
|
@ -80,7 +71,7 @@ class CardPreviewArrayAdapter extends ArrayAdapter<PreviewCard> {
|
|||
final View openCardOptions = (LayoutInflater.from(getContext())
|
||||
.inflate(R.layout.card_settings_dialog, null));
|
||||
|
||||
final EditText cardNameEditText = (EditText) openCardOptions.findViewById(R.id.card_setting_name_edit_text);
|
||||
final EditText cardNameEditText = openCardOptions.findViewById(R.id.card_setting_name_edit_text);
|
||||
cardNameEditText.setText(card.getName());
|
||||
|
||||
builder.setTitle("Card settings")
|
||||
|
|
@ -115,7 +106,7 @@ class CardPreviewArrayAdapter extends ArrayAdapter<PreviewCard> {
|
|||
|
||||
final Dialog dialog = builder.create();
|
||||
|
||||
final TextView deleteCardLink = (TextView) openCardOptions.findViewById(R.id.card_setting_delete_card);
|
||||
final TextView deleteCardLink = openCardOptions.findViewById(R.id.card_setting_delete_card);
|
||||
deleteCardLink.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
|
|
|
|||
|
|
@ -2,8 +2,13 @@ package com.codigoparallevar.minicards;
|
|||
|
||||
import android.app.Dialog;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.SharedPreferences;
|
||||
import android.os.AsyncTask;
|
||||
import android.os.Bundle;
|
||||
|
||||
import com.codigoparallevar.minicards.types.functional.Function;
|
||||
import com.codigoparallevar.minicards.types.functional.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.functional.Tuple3;
|
||||
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
||||
import androidx.appcompat.app.AlertDialog;
|
||||
import androidx.appcompat.widget.Toolbar;
|
||||
|
|
@ -27,6 +32,8 @@ import java.util.Vector;
|
|||
import com.programaker.api.ProgramakerApi;
|
||||
|
||||
public class DeckPreviewActivity extends ReloadableAppCompatActivity {
|
||||
private static final String TOKEN_KEY = "PROGRAMAKER_API_TOKEN";
|
||||
private static final String PREFERENCES_NAME = "MINICARDS_PREFERENCES";
|
||||
|
||||
public static final String INTENT = "com.codigoparallevar.minicards.DECK";
|
||||
private ListView listView;
|
||||
|
|
@ -39,11 +46,11 @@ public class DeckPreviewActivity extends ReloadableAppCompatActivity {
|
|||
final View loginDialog = (LayoutInflater.from(this)
|
||||
.inflate(R.layout.login_dialog_view, null));
|
||||
|
||||
final EditText loginUsernameText = (EditText) loginDialog.findViewById(R.id.login_username_text);
|
||||
final EditText loginPasswordText = (EditText) loginDialog.findViewById(R.id.login_password_text);
|
||||
final Button loginButton = (Button) loginDialog.findViewById(R.id.login_dialog_login_button);
|
||||
final Button cancelButton = (Button) loginDialog.findViewById(R.id.login_dialog_cancel_button);
|
||||
final TextView messageLabel = (TextView) loginDialog.findViewById(R.id.login_message_label);
|
||||
final EditText loginUsernameText = loginDialog.findViewById(R.id.login_username_text);
|
||||
final EditText loginPasswordText = loginDialog.findViewById(R.id.login_password_text);
|
||||
final Button loginButton = loginDialog.findViewById(R.id.login_dialog_login_button);
|
||||
final Button cancelButton = loginDialog.findViewById(R.id.login_dialog_cancel_button);
|
||||
final TextView messageLabel = loginDialog.findViewById(R.id.login_message_label);
|
||||
|
||||
builder.setTitle("Login").setView(loginDialog);
|
||||
final Dialog dialog = builder.create();
|
||||
|
|
@ -84,19 +91,95 @@ public class DeckPreviewActivity extends ReloadableAppCompatActivity {
|
|||
public void onClick(View v) {
|
||||
messageLabel.setVisibility(View.VISIBLE);
|
||||
messageLabel.setText(R.string.loading);
|
||||
watcher.afterTextChanged(null);
|
||||
new CheckLogin().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,
|
||||
new Tuple3<>(
|
||||
loginUsernameText.getText().toString(),
|
||||
loginPasswordText.getText().toString(),
|
||||
new Function<String>() {
|
||||
public void apply(String token) {
|
||||
if (token == null) {
|
||||
messageLabel.setText(R.string.invalid_user_pass);
|
||||
} else {
|
||||
DeckPreviewActivity.this.setToken(token);
|
||||
final Button loginToProgramakerButton = findViewById(R.id.login_in_programaker_button);
|
||||
|
||||
loginToProgramakerButton.setVisibility(View.GONE);
|
||||
// Re-check... just in case
|
||||
new CheckNeededLoginButton().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,
|
||||
new Tuple2<>(DeckPreviewActivity.this.ProgramakerApi,
|
||||
loginToProgramakerButton));
|
||||
dialog.cancel();
|
||||
}
|
||||
}
|
||||
}));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void setToken(String token) {
|
||||
SharedPreferences preferences = getSharedPreferences(PREFERENCES_NAME, MODE_PRIVATE);
|
||||
SharedPreferences.Editor edit = preferences.edit();
|
||||
|
||||
edit.putString(TOKEN_KEY, token);
|
||||
edit.commit();
|
||||
|
||||
this.ProgramakerApi.setToken(token);
|
||||
}
|
||||
|
||||
private String getToken() {
|
||||
SharedPreferences preferences = getSharedPreferences(PREFERENCES_NAME, MODE_PRIVATE);
|
||||
if (!preferences.contains(TOKEN_KEY)) {
|
||||
return null;
|
||||
}
|
||||
else {
|
||||
return preferences.getString(TOKEN_KEY, null);
|
||||
}
|
||||
}
|
||||
|
||||
static class CheckLogin extends AsyncTask<Tuple3<String, String, Function<String>>,
|
||||
Void, Tuple2<String, Function<String>>>{
|
||||
@Override
|
||||
protected Tuple2<String, Function<String>> doInBackground(Tuple3<String, String, Function<String>>... tuples) {
|
||||
ProgramakerApi api = new ProgramakerApi();
|
||||
boolean logged = false;
|
||||
String token = null;
|
||||
try {
|
||||
token = api.login(tuples[0]._x, tuples[0]._y);
|
||||
}
|
||||
catch (Exception e) {
|
||||
Log.e("Login to PrograMaker", e.toString());
|
||||
}
|
||||
return new Tuple2<String, Function<String>>(token, tuples[0]._z);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onPostExecute(Tuple2<String, Function<String>> result) {
|
||||
result.item2.apply(result.item1);
|
||||
}
|
||||
}
|
||||
|
||||
static class CheckNeededLoginButton extends AsyncTask<Tuple2<ProgramakerApi, Button>, Void, Tuple2<Boolean, Button>>{
|
||||
@Override
|
||||
protected Tuple2<Boolean, Button> doInBackground(Tuple2<ProgramakerApi, Button>... tuples) {
|
||||
return new Tuple2<>(tuples[0].item1.check(), tuples[0].item2);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onPostExecute(Tuple2<Boolean, Button> result) {
|
||||
if (!result.item1) {
|
||||
result.item2.setVisibility(View.VISIBLE);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_deck_preview);
|
||||
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
|
||||
Toolbar toolbar = findViewById(R.id.toolbar);
|
||||
setSupportActionBar(toolbar);
|
||||
|
||||
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.create_new_card_fab);
|
||||
FloatingActionButton fab = findViewById(R.id.create_new_card_fab);
|
||||
fab.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
|
|
@ -104,7 +187,7 @@ public class DeckPreviewActivity extends ReloadableAppCompatActivity {
|
|||
}
|
||||
});
|
||||
|
||||
Button loginButton = (Button) findViewById(R.id.login_in_programaker_button);
|
||||
final Button loginButton = findViewById(R.id.login_in_programaker_button);
|
||||
loginButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
|
|
@ -112,18 +195,19 @@ public class DeckPreviewActivity extends ReloadableAppCompatActivity {
|
|||
}
|
||||
});
|
||||
|
||||
listView = (ListView) findViewById(R.id.card_deck_list);
|
||||
listView = findViewById(R.id.card_deck_list);
|
||||
|
||||
|
||||
new AsyncTask<ProgramakerApi, Void, Boolean>() {
|
||||
protected Boolean doInBackground(ProgramakerApi... api) {
|
||||
return api[0].Check();
|
||||
}
|
||||
|
||||
protected void onPostExecute(Boolean result) {
|
||||
Log.d("MiniCards", "check result: " + result);
|
||||
}
|
||||
}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, this.ProgramakerApi);
|
||||
String token = getToken();
|
||||
if (token == null) {
|
||||
loginButton.setVisibility(View.VISIBLE);
|
||||
}
|
||||
else {
|
||||
loginButton.setVisibility(View.GONE);
|
||||
this.ProgramakerApi.setToken(token);
|
||||
// Double check that is not needed
|
||||
new CheckNeededLoginButton().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,
|
||||
new Tuple2<>(this.ProgramakerApi, loginButton));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -145,7 +229,7 @@ public class DeckPreviewActivity extends ReloadableAppCompatActivity {
|
|||
final View openCardOptions = (LayoutInflater.from(this)
|
||||
.inflate(R.layout.create_new_card_view, null));
|
||||
|
||||
final EditText cardNameEditText = (EditText) openCardOptions.findViewById(R.id.card_name_edit_text);
|
||||
final EditText cardNameEditText = openCardOptions.findViewById(R.id.card_name_edit_text);
|
||||
|
||||
builder.setTitle("Create a new card")
|
||||
.setView(openCardOptions)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ package com.codigoparallevar.minicards;
|
|||
|
||||
import com.codigoparallevar.minicards.types.Part;
|
||||
import com.codigoparallevar.minicards.types.PartGrid;
|
||||
import com.codigoparallevar.minicards.types.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.functional.Tuple2;
|
||||
|
||||
public abstract class PartInstantiator {
|
||||
protected abstract Part instantiate(PartGrid grid, Tuple2<Integer, Integer> center);
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ import com.codigoparallevar.minicards.parts.logic.Toggle;
|
|||
import com.codigoparallevar.minicards.parts.samples.ColorBox;
|
||||
import com.codigoparallevar.minicards.parts.strings.ConvertToString;
|
||||
import com.codigoparallevar.minicards.types.Part;
|
||||
import com.codigoparallevar.minicards.types.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.functional.Tuple2;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Vector;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import android.graphics.Path;
|
|||
import android.graphics.Rect;
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
import com.codigoparallevar.minicards.types.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.functional.Tuple2;
|
||||
|
||||
public class ScrolledCanvas {
|
||||
private final Canvas canvas;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ package com.codigoparallevar.minicards;
|
|||
|
||||
import com.codigoparallevar.minicards.types.PartGrid;
|
||||
import com.codigoparallevar.minicards.types.Selectable;
|
||||
import com.codigoparallevar.minicards.types.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.functional.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.connectors.input.BooleanInputConnector;
|
||||
import com.codigoparallevar.minicards.types.connectors.input.SignalInputConnector;
|
||||
import com.codigoparallevar.minicards.types.connectors.input.StringInputConnector;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ import com.codigoparallevar.minicards.types.Moveable;
|
|||
import com.codigoparallevar.minicards.types.Part;
|
||||
import com.codigoparallevar.minicards.types.PartConnection;
|
||||
import com.codigoparallevar.minicards.types.PartGrid;
|
||||
import com.codigoparallevar.minicards.types.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.functional.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.connectors.input.InputConnector;
|
||||
import com.codigoparallevar.minicards.types.connectors.output.OutputConnector;
|
||||
import com.codigoparallevar.minicards.types.wireData.Signal;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import com.codigoparallevar.minicards.types.Drawable;
|
|||
import com.codigoparallevar.minicards.types.Moveable;
|
||||
import com.codigoparallevar.minicards.types.Part;
|
||||
import com.codigoparallevar.minicards.types.PartGrid;
|
||||
import com.codigoparallevar.minicards.types.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.functional.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.connectors.Wiring.BooleanWire;
|
||||
import com.codigoparallevar.minicards.types.connectors.input.BooleanInputConnector;
|
||||
import com.codigoparallevar.minicards.types.connectors.input.InputConnector;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import com.codigoparallevar.minicards.types.Drawable;
|
|||
import com.codigoparallevar.minicards.types.Moveable;
|
||||
import com.codigoparallevar.minicards.types.Part;
|
||||
import com.codigoparallevar.minicards.types.PartGrid;
|
||||
import com.codigoparallevar.minicards.types.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.functional.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.connectors.Wiring.SignalWire;
|
||||
import com.codigoparallevar.minicards.types.connectors.input.InputConnector;
|
||||
import com.codigoparallevar.minicards.types.connectors.input.SignalInputConnector;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import com.codigoparallevar.minicards.types.Drawable;
|
|||
import com.codigoparallevar.minicards.types.Moveable;
|
||||
import com.codigoparallevar.minicards.types.Part;
|
||||
import com.codigoparallevar.minicards.types.PartGrid;
|
||||
import com.codigoparallevar.minicards.types.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.functional.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.connectors.Wiring.StringWire;
|
||||
import com.codigoparallevar.minicards.types.connectors.input.InputConnector;
|
||||
import com.codigoparallevar.minicards.types.connectors.input.StringInputConnector;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ import com.codigoparallevar.minicards.types.Moveable;
|
|||
import com.codigoparallevar.minicards.types.Part;
|
||||
import com.codigoparallevar.minicards.types.PartConnection;
|
||||
import com.codigoparallevar.minicards.types.PartGrid;
|
||||
import com.codigoparallevar.minicards.types.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.functional.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.connectors.input.InputConnector;
|
||||
import com.codigoparallevar.minicards.types.connectors.output.OutputConnector;
|
||||
import com.codigoparallevar.minicards.types.wireData.Signal;
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ import com.codigoparallevar.minicards.types.Moveable;
|
|||
import com.codigoparallevar.minicards.types.Part;
|
||||
import com.codigoparallevar.minicards.types.PartConnection;
|
||||
import com.codigoparallevar.minicards.types.PartGrid;
|
||||
import com.codigoparallevar.minicards.types.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.functional.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.connectors.input.InputConnector;
|
||||
import com.codigoparallevar.minicards.types.connectors.input.SignalInputConnector;
|
||||
import com.codigoparallevar.minicards.types.connectors.output.OutputConnector;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ import com.codigoparallevar.minicards.parts.connectors.BooleanRoundInputConnecto
|
|||
import com.codigoparallevar.minicards.types.Moveable;
|
||||
import com.codigoparallevar.minicards.types.Part;
|
||||
import com.codigoparallevar.minicards.types.PartGrid;
|
||||
import com.codigoparallevar.minicards.types.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.functional.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.connectors.input.BooleanInputConnector;
|
||||
import com.codigoparallevar.minicards.types.connectors.input.InputConnector;
|
||||
import com.codigoparallevar.minicards.types.connectors.output.OutputConnector;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ import com.codigoparallevar.minicards.types.Moveable;
|
|||
import com.codigoparallevar.minicards.types.Part;
|
||||
import com.codigoparallevar.minicards.types.PartConnection;
|
||||
import com.codigoparallevar.minicards.types.PartGrid;
|
||||
import com.codigoparallevar.minicards.types.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.functional.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.connectors.input.AnyInputConnector;
|
||||
import com.codigoparallevar.minicards.types.connectors.input.InputConnector;
|
||||
import com.codigoparallevar.minicards.types.connectors.output.OutputConnector;
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package com.codigoparallevar.minicards.types;
|
|||
import com.codigoparallevar.minicards.types.connectors.input.BooleanInputConnector;
|
||||
import com.codigoparallevar.minicards.types.connectors.input.SignalInputConnector;
|
||||
import com.codigoparallevar.minicards.types.connectors.input.StringInputConnector;
|
||||
import com.codigoparallevar.minicards.types.functional.Tuple2;
|
||||
|
||||
public interface PartGrid {
|
||||
Selectable getPartOn(int x, int y);
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ package com.codigoparallevar.minicards.types.connectors.output;
|
|||
import com.codigoparallevar.minicards.ScrolledCanvas;
|
||||
import com.codigoparallevar.minicards.types.Dropper;
|
||||
import com.codigoparallevar.minicards.types.Selectable;
|
||||
import com.codigoparallevar.minicards.types.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.functional.Tuple2;
|
||||
import com.codigoparallevar.minicards.types.connectors.Wiring.Wire;
|
||||
import com.codigoparallevar.minicards.types.connectors.input.InputConnector;
|
||||
import com.codigoparallevar.minicards.types.wireData.WireDataType;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
package com.codigoparallevar.minicards.types.functional;
|
||||
|
||||
public abstract class Function<T> {
|
||||
public abstract void apply(T param);
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.codigoparallevar.minicards.types;
|
||||
package com.codigoparallevar.minicards.types.functional;
|
||||
|
||||
public class Tuple2<T1, T2> {
|
||||
public final T1 item1;
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
package com.codigoparallevar.minicards.types.functional;
|
||||
|
||||
public class Tuple3<T, T1, T2> {
|
||||
|
||||
public final T _x;
|
||||
public final T1 _y;
|
||||
public final T2 _z;
|
||||
|
||||
public Tuple3(T x, T1 y, T2 z) {
|
||||
_x = x;
|
||||
_y = y;
|
||||
_z = z;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString(){
|
||||
return "(" + _x + " - " + _y + ", " + _z + ")";
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.codigoparallevar.minicards.types;
|
||||
package com.codigoparallevar.minicards.types.functional;
|
||||
|
||||
public class Tuple4<T, T1, T2, T3> {
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue