From b87f082fe0e9c05cf45c56b510a2c4000133b572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 24 Mar 2015 19:07:43 +0100 Subject: Indent everything with IntelliJ --- .../se/leap/bitmaskclient/ProviderListContent.java | 155 +++++++++++++-------- 1 file changed, 100 insertions(+), 55 deletions(-) (limited to 'app/src/release/java/se/leap/bitmaskclient/ProviderListContent.java') diff --git a/app/src/release/java/se/leap/bitmaskclient/ProviderListContent.java b/app/src/release/java/se/leap/bitmaskclient/ProviderListContent.java index 64e5be07..b604ce09 100644 --- a/app/src/release/java/se/leap/bitmaskclient/ProviderListContent.java +++ b/app/src/release/java/se/leap/bitmaskclient/ProviderListContent.java @@ -1,7 +1,6 @@ /** * Copyright (c) 2013 LEAP Encryption Access Project and contributers - * - * This program is free software: you can redistribute it and/or modify + * * 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 3 of the License, or * (at your option) any later version. @@ -14,64 +13,110 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - package se.leap.bitmaskclient; +ackage se.leap.bitmaskclient; -import java.io.*; -import java.util.*; -import java.net.*; + import java.io.*; + import java.util.*; + import java.net.*; /** * Models the provider list shown in the ConfigurationWizard. - * - * @author parmegv * + * @author parmegv */ public class ProviderListContent { - public static List ITEMS = new ArrayList(); - - public static Map ITEM_MAP = new HashMap(); - - /** - * Adds a new provider item to the end of the items map, and to the items list. - * @param item - */ - public static void addItem(ProviderItem item) { - ITEMS.add(item); - ITEM_MAP.put(String.valueOf(ITEMS.size()), item); - } - public static void removeItem(ProviderItem item) { - ITEMS.remove(item); - ITEM_MAP.remove(item); - } - - /** - * A provider item. - */ - public static class ProviderItem { - final public static String CUSTOM = "custom"; - private String provider_main_url; - private String name; - - /** - * @param name of the provider - * @param provider_main_url used to download provider.json file of the provider - */ - public ProviderItem(String name, String provider_main_url) { - this.name = name; - this.provider_main_url = provider_main_url; - } - - public String name() { return name; } - - public String providerMainUrl() { return provider_main_url; } - - public String domain() { - try { - return new URL(provider_main_url).getHost(); - } catch (MalformedURLException e) { - return provider_main_url.replaceFirst("http[s]?://", "").replaceFirst("/.*", ""); - } - } - } -} + p blic + static List ITEMS = new ArrayList(); + + p blic + static Map ITEM_MAP = new HashMap(); + + / * + * + Adds a + new + provider item + to the + end of + the items + map, + and to + the items + list. + * + * + @param + item + / + p blic + + static void addItem(ProviderItem item) { + EMS.add(item); + EM_MAP.put(String.valueOf(ITEMS.size()), item); + } + + p + blic + + static void removeItem(ProviderItem item) { + EMS.remove(item); + EM_MAP.remove(item); + } + + / * + * + A provider + item. + / + p blic + + static class ProviderItem { + nal + public static String CUSTOM = "custom"; + ivate String + provider_main_url; + ivate String + name; + + * + * + @param + name of + the provider + * + @param + provider_main_url used + to download + provider.json file + of the + provider + / + + blic ProviderItem(String name, String provider_main_url) { + is.name = name; + is.provider_main_url = provider_main_url; + + + ic String name() { + ret + urn name; + } + + + p + String providerMainUrl () { + retur + n provider_main_url; + } + + + pub + tring domain () { + try { + retu ew URL(provider_main_url).getHost(); + } cat(MalformedURLException e) { + retu rovider_main_url.replaceFirst("http[s]?://", "").replaceFirst("/.*", ""); + } + } + } -- cgit v1.2.3