Skip to content

Commit

Permalink
Format code and optimize imports
Browse files Browse the repository at this point in the history
  • Loading branch information
@dodyg
dodyg committed Mar 26, 2013
1 parent 9a56cfb commit edc3c2a
Show file tree
Hide file tree
Showing 13 changed files with 69 additions and 88 deletions.
4 changes: 2 additions & 2 deletions NewsEngine/src/com/silverkeytech/news_engine/Inits.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.silverkeytech.news_engine

public var log : ((String, String) -> Unit) = { x, y -> }
public var scrubHtml : ( (String?) -> String) = { x -> "" }
public var log: ((String, String) -> Unit) = { x, y -> }
public var scrubHtml: ( (String?) -> String) = { x -> "" }
10 changes: 1 addition & 9 deletions NewsEngine/src/com/silverkeytech/news_engine/Texts.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>

package com.silverkeytech.news_engine

import android.app.Activity
import android.graphics.Typeface
import android.text.SpannableStringBuilder
import android.text.style.ImageSpan
import android.util.Log
import android.util.TypedValue
import android.view.Gravity
import android.widget.TextView
import java.net.URL
import java.util.UUID

fun scrubJsonP(text: String): String {
Expand All @@ -42,7 +34,7 @@ fun String?.isNullOrEmpty(): Boolean {
}


fun rightPadding(text: String, sizeTarget : Int): String{
fun rightPadding(text: String, sizeTarget: Int): String {
if (text.length() < sizeTarget){
var spaces = StringBuffer()
val diff = sizeTarget - text.length()
Expand Down
4 changes: 2 additions & 2 deletions NewsEngine/src/com/silverkeytech/news_engine/syndications/SyndicationFeed.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ public data class SyndicationFeed(public val rss: Rss?, public val atom: Feed?,
}
}

public fun transformRdf(){
public fun transformRdf() {
if (rdf != null){
val (parseable, dateFormat) = verifyRdfFeedForDateFitness(rdf!!)
isDateParseable = parseable
Expand All @@ -210,7 +210,7 @@ public data class SyndicationFeed(public val rss: Rss?, public val atom: Feed?,
val oldestDate = filter?.oldestDate

for(i in rdf!!.item){
itemCounter ++
itemCounter++

//stop processing if there's a limit on how many items to be processed
if (maxSize != null && itemCounter > maxSize){
Expand Down
1 change: 0 additions & 1 deletion NewsEngine/src/com/silverkeytech/news_engine/syndications/SyndicationFeedItem.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import java.util.Date
import java.util.HashMap
import com.silverkeytech.news_engine.isNullOrEmpty


public data class SyndicationFeedItem(){
public var title: String? = null
public var description: String? = null
Expand Down
26 changes: 13 additions & 13 deletions NewsEngine/src/com/silverkeytech/news_engine/syndications/Utils.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ public enum class ParsedDateFormat{
ISO8601_NOMS_NO_TZ
}

public data class RssDate(public val status : ParsedDateFormat, public val date : Date?){
public val isValid : Boolean
public data class RssDate(public val status: ParsedDateFormat, public val date: Date?){
public val isValid: Boolean
get() = status != ParsedDateFormat.UNKNOWN && status != ParsedDateFormat.MISSING
}

public fun parseDate(date : String?) : RssDate{
public fun parseDate(date: String?): RssDate {
if (date == null)
return RssDate(ParsedDateFormat.MISSING, null)

Expand All @@ -31,7 +31,7 @@ public fun parseDate(date : String?) : RssDate{
{
return RssDate(ParsedDateFormat.ISO8601_NOMS, DateHelper.parseISO8601NoMilliseconds(date.replaceAll("Z$", "+0000")))
}
catch (e : Exception) {
catch (e: Exception) {
log("RdfRssItem", "Error parsing " + date + " in ISO8601_NOMS Modified Z")
}

Expand All @@ -41,39 +41,39 @@ public fun parseDate(date : String?) : RssDate{
{
return RssDate(ParsedDateFormat.RFC822, DateHelper.parseRFC822(date))
}
catch (e : Exception) {
catch (e: Exception) {
log("RdfRssItem", "Error parsing " + date + " in RFC822")
}

try
{
return RssDate(ParsedDateFormat.ISO8601_NOMS, DateHelper.parseISO8601NoMilliseconds(date))
}
catch (e : Exception) {
catch (e: Exception) {
log("RdfRssItem", "Error parsing " + date + " in ISO8601_NOMS")
}

try
{
return RssDate(ParsedDateFormat.ISO8601_NOMS_NO_TZ, DateHelper.parse(DateHelper.ISO8601_NOMS_NO_TZ, date))
}
catch (e : Exception) {
catch (e: Exception) {
log("RdfRssItem", "Error parsing " + date + " in ISO8601_NOMS_GENERAL_TZ")
}

try
{
return RssDate(ParsedDateFormat.NO_SPACES, DateHelper.parse(DateHelper.NO_SPACES, date))
}
catch (e : Exception) {
catch (e: Exception) {
log("RdfRssItem", "Error parsing " + date + " in NO_SPACES")
}

return RssDate(ParsedDateFormat.UNKNOWN, null)

}

public fun getDateInFormat(status : ParsedDateFormat, date : String) : Date? {
public fun getDateInFormat(status: ParsedDateFormat, date: String): Date? {
try
{
if (status == ParsedDateFormat.RFC822)
Expand All @@ -86,15 +86,15 @@ public fun getDateInFormat(status : ParsedDateFormat, date : String) : Date? {
else
return DateHelper.parseISO8601NoMilliseconds(date)
}
else if (status == ParsedDateFormat.ISO8601_NOMS_NO_TZ)
return DateHelper.parse(DateHelper.ISO8601_NOMS_NO_TZ, date)
else if (status == ParsedDateFormat.ISO8601_NOMS_NO_TZ)
return DateHelper.parse(DateHelper.ISO8601_NOMS_NO_TZ, date)
else
if (status == ParsedDateFormat.NO_SPACES)
return DateHelper.parse(DateHelper.NO_SPACES, date)
else
return null
}
catch (e : Exception) {
catch (e: Exception) {
return null
}
}
Expand Down Expand Up @@ -122,7 +122,7 @@ public fun verifyRssFeedForDateFitness(r: Rss): Pair<Boolean, ParsedDateFormat?>
}
}

public fun verifyRdfFeedForDateFitness(r: Rdf): Pair<Boolean, ParsedDateFormat?>{
public fun verifyRdfFeedForDateFitness(r: Rdf): Pair<Boolean, ParsedDateFormat?> {
try{
if (r.item.size() == 0)
return Pair(false, null)
Expand Down
4 changes: 1 addition & 3 deletions NewsEngine/src/com/silverkeytech/news_engine/syndications/rss/Item.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@

package com.silverkeytech.news_engine.syndications.rss;

import android.util.Log;
import com.silverkeytech.news_engine.DateHelper;
import com.silverkeytech.news_engine.syndications.ParsedDateFormat;
import com.silverkeytech.news_engine.syndications.RssDate;
import com.silverkeytech.news_engine.syndications.SyndicationsPackage;
Expand Down Expand Up @@ -50,7 +48,7 @@ public RssDate getPubDate() {
return SyndicationsPackage.parseDate(pubDate);
}

public Date getPubDateInFormat(ParsedDateFormat status){
public Date getPubDateInFormat(ParsedDateFormat status) {
return SyndicationsPackage.getDateInFormat(status, pubDate);
}
}
1 change: 0 additions & 1 deletion NewsEngine/src/com/silverkeytech/news_engine/syndications/rss/RssParser.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>

package com.silverkeytech.news_engine.syndications.rss

import com.silverkeytech.news_engine.syndications.rss.RssBuilder
import com.thebuzzmedia.sjxp.XMLParser
import java.io.InputStream
import com.silverkeytech.news_engine.xml.textRule
Expand Down
10 changes: 5 additions & 5 deletions NewsEngine/src/com/silverkeytech/news_engine/syndications/rss_rdf/Channel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
package com.silverkeytech.news_engine.syndications.rss_rdf

public class Channel{
public var title : String? = null
public var description : String? = null
public var link : String? = null
public var about : String? = null
public var dc : DublinCore = DublinCore()
public var title: String? = null
public var description: String? = null
public var link: String? = null
public var about: String? = null
public var dc: DublinCore = DublinCore()
}
7 changes: 2 additions & 5 deletions NewsEngine/src/com/silverkeytech/news_engine/syndications/rss_rdf/DublinCore.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
package com.silverkeytech.news_engine.syndications.rss_rdf

import java.util.Date

import com.silverkeytech.news_engine.syndications.RssDate
import com.silverkeytech.news_engine.syndications.ParsedDateFormat
import com.silverkeytech.news_engine.DateHelper
import com.silverkeytech.news_engine.log
import com.silverkeytech.news_engine.syndications.parseDate
import com.silverkeytech.news_engine.syndications.getDateInFormat

Expand All @@ -37,10 +34,10 @@ public class DublinCore(){
public var creator: String? = null
public var subject: String? = null

public fun getDate() : RssDate {
public fun getDate(): RssDate {
return parseDate(date)
}
public fun geDateInFormat(status : ParsedDateFormat) : Date? {
public fun geDateInFormat(status: ParsedDateFormat): Date? {
return getDateInFormat(status, date!!)
}
}
13 changes: 5 additions & 8 deletions NewsEngine/src/com/silverkeytech/news_engine/syndications/rss_rdf/Item.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>

package com.silverkeytech.news_engine.syndications.rss_rdf

import java.util.Date


public class Item(){
public var title : String? = null
public var description : String? = null
public var link : String? = null
public var about : String? = null
public var dc : DublinCore = DublinCore()
public var title: String? = null
public var description: String? = null
public var link: String? = null
public var about: String? = null
public var dc: DublinCore = DublinCore()
}
4 changes: 2 additions & 2 deletions NewsEngine/src/com/silverkeytech/news_engine/syndications/rss_rdf/Rdf.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ package com.silverkeytech.news_engine.syndications.rss_rdf
import java.util.ArrayList

public class Rdf(){
public var channel : Channel = Channel()
public var item : ArrayList<Item> = ArrayList<Item>()
public var channel: Channel = Channel()
public var item: ArrayList<Item> = ArrayList<Item>()
}
42 changes: 21 additions & 21 deletions NewsEngine/src/com/silverkeytech/news_engine/syndications/rss_rdf/RdfRssBuilder.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class RdfRssBuilder(){
return rdf
}

public class ChannelBuilder(private val rdf : Rdf){
public class ChannelBuilder(private val rdf: Rdf){
{
rdf.channel = Channel()
}
Expand All @@ -37,85 +37,85 @@ public class RdfRssBuilder(){
$item = value
}

public fun setTitle(title : String){
public fun setTitle(title: String) {
rdf.channel.title = title
}

public fun setDescription(description : String){
public fun setDescription(description: String) {
rdf.channel.description = description
}

public fun setLink(link : String){
public fun setLink(link: String) {
rdf.channel.link = link
}

public fun setDcPublisher(publisher : String){
public fun setDcPublisher(publisher: String) {
rdf.channel.dc.publisher = publisher
}

public fun setDcLanguage(lang : String){
public fun setDcLanguage(lang: String) {
rdf.channel.dc.language = lang
}

public fun setDcRights(rights : String){
public fun setDcRights(rights: String) {
rdf.channel.dc.rights = rights
}

public fun setDcTitle(title : String){
public fun setDcTitle(title: String) {
rdf.channel.dc.title = title
}

public fun setDcCreator(creator : String){
public fun setDcCreator(creator: String) {
rdf.channel.dc.creator = creator
}

public fun setDcSource(source : String){
public fun setDcSource(source: String) {
rdf.channel.dc.source = source
}

public fun startItem(){
public fun startItem() {
item = ItemBuilder(Item())
}

public fun endItem(){
public fun endItem() {
rdf.item.add(item.data)
}
}

public class ItemBuilder(public val data: Item){
public fun setTitle(title : String){
public fun setTitle(title: String) {
data.title = title
}

public fun setLink(link : String){
public fun setLink(link: String) {
data.link = link
}

public fun setDescription(description : String){
public fun setDescription(description: String) {
data.description = description
}

public fun setAbout(about : String){
public fun setAbout(about: String) {
data.about = about
}

public fun setDcDate(date : String){
public fun setDcDate(date: String) {
data.dc.date = date
}

public fun setDcLanguage(lang : String){
public fun setDcLanguage(lang: String) {
data.dc.language = lang
}

public fun setDcRights(rights : String){
public fun setDcRights(rights: String) {
data.dc.rights = rights
}

public fun setDcSource(source : String){
public fun setDcSource(source: String) {
data.dc.source = source
}

public fun setDcTitle(title : String){
public fun setDcTitle(title: String) {
data.dc.title = title
}
}
Expand Down
Loading

0 comments on commit edc3c2a

Please sign in to comment.