Merge branch 'master' of git://github.com/msgpack/msgpack

This commit is contained in:
takeshita
2011-04-14 15:44:46 +09:00
41 changed files with 778 additions and 988 deletions

View File

@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.msgpack</groupId>
<artifactId>scala-msgpack</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.1-devel</version>
<name>${project.artifactId}</name>
<description>My wonderfull scala app</description>
<inceptionYear>2010</inceptionYear>

View File

@@ -7,7 +7,8 @@ import java.lang.Class
import collection.immutable.{ListMap, TreeMap}
import java.lang.reflect.{Type, Modifier, Method, Field}
import java.lang.annotation.{Annotation => JavaAnnotation}
import javassist.{JavassistTemplate, BuildContextBase, BuildContext}
import builder.{JavassistTemplateBuilder, BuildContextBase, BuildContext}
import builder.JavassistTemplateBuilder.JavassistTemplate
import scala.collection.JavaConverters._
;
/*
@@ -26,6 +27,23 @@ import scala.collection.JavaConverters._
var templates : Array[Template] = null
var minimumArrayLength : Int = 0
def writeTemplate(targetClass : Class[_] , entries : Array[IFieldEntry],
templates : Array[Template], directoryName : String) = {
this.entries = entries;
this.templates = templates;
this.origClass = targetClass;
this.origName = this.origClass.getName();
write(this.origName, directoryName);
}
def loadTemplate(targetClass : Class[_] , entries : Array[IFieldEntry], templates : Array[Template]) = {
this.entries = entries;
this.templates = templates;
this.origClass = targetClass;
this.origName = this.origClass.getName();
load(this.origName);
}
def buildTemplate(targetClass : Class[_] , entries : Array[IFieldEntry], templates : Array[Template]) = {
this.entries = entries;
this.templates = templates;

View File

@@ -1,10 +1,9 @@
package org.msgpack
import template._
import builder.{MessagePackMessageBuilderSelector, BuilderSelectorRegistry}
import template.javassist.BuildContextFactory
import builder.{AnnotationTemplateBuilderSelector, BuilderSelectorRegistry, BuildContextFactory}
import collection.mutable.{MutableList, LinkedList}
import collection.mutable.{Map => MMap,HashMap => MHashMap}
import collection.mutable.{Map => MMap, HashMap => MHashMap}
;
/*
* Created by IntelliJ IDEA.
@@ -18,7 +17,7 @@ object ScalaMessagePack {
{
// for scala object
BuilderSelectorRegistry.getInstance.insertBefore(
MessagePackMessageBuilderSelector.NAME,
AnnotationTemplateBuilderSelector.NAME,
new ScalaTemplateBuilderSelector)
// register scala's list classes

View File

@@ -3,8 +3,7 @@ package org.msgpack
import annotation.MessagePackMessage
import template.builder.BuilderSelector
import java.lang.reflect.Type
import template.javassist.BuildContextFactory
import template.JavassistTemplateBuilder
import template.builder.{JavassistTemplateBuilder, BuildContextFactory}
import java.lang.annotation.{Annotation => JAnnotation}
;
/*